From a24fc8068343f0a74bc8904d043fc14fa6ed516e Mon Sep 17 00:00:00 2001 From: Jonathan Hui Date: Wed, 4 Mar 2020 10:32:37 -0800 Subject: [PATCH] [build] allow downstream to change the default build flags (#22) * build: allow downstream to change the default build flags * chore: only append warning flags not clear them out * build: do not use cpp extensions --- CMakeLists.txt | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 384c216c7..39820988c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,18 +29,21 @@ cmake_minimum_required(VERSION 3.13.1) project(ot-commissioner VERSION 1.0.0) +option(OT_COMM_COVERAGE "Enable coverage reporting" OFF) +option(OT_COMM_TEST "Build tests" ON) +option(OT_COMM_APP "Build the CLI App" ON) + if (NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Debug) endif() -option(OT_COMM_COVERAGE "Enable coverage reporting" OFF) -option(OT_COMM_TEST "Build tests" ON) -option(OT_COMM_APP "Build the CLI App" ON) - -set(CMAKE_CXX_STANDARD 11) -set(CMAKE_CXX_STANDARD_REQUIRED ON) +if(NOT "${CMAKE_CXX_STANDARD}") + set(CMAKE_CXX_STANDARD 11) + set(CMAKE_CXX_STANDARD_REQUIRED ON) +endif() set(CMAKE_CXX_EXTENSIONS OFF) -set(CMAKE_CXX_FLAGS "-Wall -Wextra -Werror -Wfatal-errors -Wno-missing-braces") + +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror -Wfatal-errors -Wno-missing-braces") # Defines for mbedtls set(MBEDTLS_USER_CONFIG ${PROJECT_SOURCE_DIR}/third_party/mbedtls/mbedtls_user_config.h)