From af6194c2b3829b4e13fe2fff1232250e46169afb Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Tue, 15 Aug 2017 15:45:42 +0200 Subject: [PATCH 1/1] New app-templates changes about compil flags. Now, all compilation options can be removed or rearranged. Change-Id: Id25b8154a42d5a7fcce7e031f5b87404d7585d9d Signed-off-by: Romain Forlot --- conf.d/app-templates | 2 +- conf.d/cmake/config.cmake | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/conf.d/app-templates b/conf.d/app-templates index dee58363..5b4dfe23 160000 --- a/conf.d/app-templates +++ b/conf.d/app-templates @@ -1 +1 @@ -Subproject commit dee58363ddb98f8e63239035f1a8f1ab151c5e96 +Subproject commit 5b4dfe23ef1141d8f7595a157ca7a8ee5ad8ad07 diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake index 38af7e69..553845d1 100644 --- a/conf.d/cmake/config.cmake +++ b/conf.d/cmake/config.cmake @@ -73,15 +73,22 @@ set (PKG_REQUIRED_LIST afb-daemon ) -# Static constante definition -# ----------------------------- -add_compile_options(-DPB_FIELD_16BIT) -add_compile_options($<$:-pthread>) - # Customize link option # ----------------------------- list (APPEND link_libraries -pthread) +# Compilation options definition +# Use CMake generator expressions to specify only for a specific language +# Values are prefilled with default options that is currently used. +# ----------------------------------------------------------------------- +set(COMPILE_OPTIONS "-Wall" "-Wextra" "-Wconversion" "-Wno-unused-parameter" "-Wno-sign-compare" "-Wno-sign-conversion" "-Werror=maybe-uninitialized" "-Werror=implicit-function-declaration" "-ffunction-sections" "-fdata-sections" "-fPIC" "-DPB_FIELD_16BIT" CACHE STRING "Compilation flags") +#set(C_COMPILE_OPTIONS "" CACHE STRING "Compilation flags for C language.") +set(CXX_COMPILE_OPTIONS -pthread CACHE STRING "Compilation flags for C++ language.") +#set(PROFILING_COMPILE_OPTIONS "-g -O0 -pg -Wp,-U_FORTIFY_SOURCE" CACHE STRING "Compilation flags for PROFILING build type.") +#set(DEBUG_COMPILE_OPTIONS "-g -ggdb -Wp,-U_FORTIFY_SOURCE" CACHE STRING "Compilation flags for DEBUG build type.") +#set(CCOV_COMPILE_OPTIONS "-g -O2 --coverage" CACHE STRING "Compilation flags for CCOV build type.") +#set(RELEASE_COMPILE_OPTIONS "-g -O2" CACHE STRING "Compilation flags for RELEASE build type.") + # Print a helper message when every thing is finished # ---------------------------------------------------- set(CLOSING_MESSAGE "Test with: afb-daemon --rootdir=\$\$(pwd)/package --binding=\$\$(pwd)/package/lib/afb-low-can.so --port=1234 --tracereq=common --token=\"1\" --verbose") -- 2.16.6