X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=b8ffc0783db4a91b4c4e358e60da6be388621981;hb=2baa115da3b752cd7e44cc477f2c45bda22d444b;hp=248d7b8d39edfd476368072172b879bf8821bca1;hpb=972d71da8683259c238b3b0e69665655f2d35b70;p=vpp.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 248d7b8d39e..b8ffc0783db 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -53,19 +53,43 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 
 if (CMAKE_BUILD_TYPE)
-  set(CMAKE_C_FLAGS "-g -fPIC ${CMAKE_C_FLAGS}")
-  set(CMAKE_C_FLAGS "-fstack-protector-all ${CMAKE_C_FLAGS}")
-  set(CMAKE_C_FLAGS "-Werror ${CMAKE_C_FLAGS}")
-  set(CMAKE_C_FLAGS "-DFORTIFY_SOURCE=2 ${CMAKE_C_FLAGS}")
+  set(CMAKE_C_FLAGS "-g -fPIC -Werror -Wall ${CMAKE_C_FLAGS}")
 endif()
 
 if (compiler_flag_no_address_of_packed_member)
   set(CMAKE_C_FLAGS "-Wno-address-of-packed-member ${CMAKE_C_FLAGS}")
 endif()
 
-set(CMAKE_C_FLAGS_RELEASE "-O2 ${CMAKE_C_FLAGS_RELEASE}")
-set(CMAKE_C_FLAGS_DEBUG "-O0 -DCLIB_DEBUG ${CMAKE_C_FLAGS_DEBUG}")
-set(CMAKE_LINKER_FLAGS_RELEASE "-pie -Wl,-z,now ${CMAKE_LINKER_FLAGS_RELEASE}")
+# release
+string(CONCAT CMAKE_C_FLAGS_RELEASE
+  "-O2 "
+  "-fstack-protector "
+  "-DFORTIFY_SOURCE=2 "
+  "-fno-common "
+)
+
+string(CONCAT CMAKE_EXE_LINKER_FLAGS_RELEASE "-pie")
+
+# debug
+string(CONCAT CMAKE_C_FLAGS_DEBUG
+  "-O0 "
+  "-DCLIB_DEBUG "
+  "-fstack-protector "
+  "-DFORTIFY_SOURCE=2 "
+  "-fno-common "
+)
+
+# coverity
+string(CONCAT CMAKE_C_FLAGS_COVERITY "-O2 -D__COVERITY__")
+
+# gcov
+string(CONCAT CMAKE_C_FLAGS_GCOV
+  "-O0 "
+  "-DCLIB_DEBUG "
+  "-DCLIB_GCOV "
+  "-fprofile-arcs "
+  "-ftest-coverage ")
+
 string(TOUPPER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_UC)
 
 ##############################################################################
@@ -137,7 +161,8 @@ pr("VPP library version" "${VPP_LIB_VERSION}")
 pr("GIT toplevel dir" "${VPP_GIT_TOPLEVEL_DIR}")
 pr("Build type" "${CMAKE_BUILD_TYPE}")
 pr("C flags" "${CMAKE_C_FLAGS}${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE_UC}}")
-pr("Linker flags" "${CMAKE_LINKER_FLAGS}${CMAKE_LINKER_FLAGS_${CMAKE_BUILD_TYPE_UC}}")
+pr("Linker flags (apps)" "${CMAKE_EXE_LINKER_FLAGS}${CMAKE_EXE_LINKER_FLAGS_${CMAKE_BUILD_TYPE_UC}}")
+pr("Linker flags (libs)" "${CMAKE_SHARED_LINKER_FLAGS}${CMAKE_SHARED_LINKER_FLAGS_${CMAKE_BUILD_TYPE_UC}}")
 pr("Host processor" "${CMAKE_HOST_SYSTEM_PROCESSOR}")
 pr("Target processor" "${CMAKE_SYSTEM_PROCESSOR}")
 pr("Prefix path" "${CMAKE_PREFIX_PATH}")