Standardizes CFlags configuration. (#222)

Signed-off-by: Franco Cipollone <[email protected]>
maliput · Jun 15, 2022 · 6f17be0 · 6f17be0
1 parent 3e67619
commit 6f17be0
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 167 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,9 +9,6 @@ project(maliput_malidrive LANGUAGES C CXX VERSION 1.0.0)
 # CMake Support
 ##############################################################################
 
-# Useful string/list macros
-include (${PROJECT_SOURCE_DIR}/cmake/Utils.cmake)
-
 # Set CMAKE_INSTALL_<INCLUDEDIR|BINDIR|LIBDIR>
 include(GNUInstallDirs)
 
@@ -33,7 +30,8 @@ find_package(maliput_drake REQUIRED)
 
 message(STATUS "\n\n========= Project Configuration ========\n")
 
-include(${PROJECT_SOURCE_DIR}/cmake/MaliputMalidriveFlags.cmake)
+include(${PROJECT_SOURCE_DIR}/cmake/DefaultCFlags.cmake)
+include(${PROJECT_SOURCE_DIR}/cmake/SanitizersConfig.cmake)
 
 set(BUILD_SHARED_LIBS true)
 

diff --git a/cmake/DefaultCFlags.cmake b/cmake/DefaultCFlags.cmake
@@ -1,42 +1,3 @@
-# Note that we have to put '-rdynamic' into all of the LINK_FLAGS so that
-# we get our symbols placed into the dynamic symbol table.  This is needed so
-# that our loadable agents have access to the internal symbols from our library.
-
-# Build type link flags
-set (CMAKE_LINK_FLAGS_RELEASE " -rdynamic" CACHE INTERNAL "Link flags for release" FORCE)
-set (CMAKE_LINK_FLAGS_RELWITHDEBINFO " -rdynamic" CACHE INTERNAL "Link flags for release with debug support" FORCE)
-set (CMAKE_LINK_FLAGS_DEBUG " -rdynamic" CACHE INTERNAL "Link flags for debug" FORCE)
-set (CMAKE_LINK_FLAGS_PROFILE " -rdynamic -pg" CACHE INTERNAL "Link flags for profile" FORCE)
-
-set (CMAKE_C_FLAGS_RELEASE "")
-set (CMAKE_C_FLAGS_RELEASE "-s")
-
-set (CMAKE_C_FLAGS_RELEASE " ${CMAKE_C_FLAGS_RELEASE} -O3 -DNDEBUG ${CMAKE_C_FLAGS_ALL}" CACHE INTERNAL "C Flags for release" FORCE)
-set (CMAKE_CXX_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE})
-
-set (CMAKE_C_FLAGS_RELWITHDEBINFO " -g -O2 ${CMAKE_C_FLAGS_ALL}" CACHE INTERNAL "C Flags for release with debug support" FORCE)
-set (CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_C_FLAGS_RELWITHDEBINFO})
-
-set (CMAKE_C_FLAGS_DEBUG " -ggdb3 ${CMAKE_C_FLAGS_ALL}" CACHE INTERNAL "C Flags for debug" FORCE)
-set (CMAKE_CXX_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
-
-set (CMAKE_C_FLAGS_PROFILE " -fno-omit-frame-pointer -g -pg ${CMAKE_C_FLAGS_ALL}" CACHE INTERNAL "C Flags for profile" FORCE)
-set (CMAKE_CXX_FLAGS_PROFILE ${CMAKE_C_FLAGS_PROFILE})
-
-#####################################
-# Set all the global build flags
-set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}")
-set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}")
-set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}")
-set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}")
-
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}} -std=c++17")
-
-set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}")
-set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}")
-set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}")
-set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}")
-
 # C++ Version
 set (CMAKE_CXX_STANDARD 17)
 set (CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -49,7 +10,7 @@ if ("${CMAKE_CXX_COMPILER_ID} " MATCHES "GNU ")
     if (NOT (GCC_VERSION VERSION_GREATER 6.9))
         message(FATAL_ERROR "${PROJECT_NAME} requires g++ 7.0 or greater.")
     else ()
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdata-sections -fdiagnostics-color=always -ffunction-sections -fopenmp -fPIC   -fstack-protector -fno-omit-frame-pointer -no-canonical-prefixes -O2 -std=c++17 -Wall -Wno-builtin-macro-redefined -Wno-missing-field-initializers -Wregister -Wstrict-overflow -Wno-unused-const-variable")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdata-sections -fdiagnostics-color=always -ffunction-sections -fopenmp -fPIC -fstack-protector -fno-omit-frame-pointer -no-canonical-prefixes -O2 -std=c++17 -Wall -Wno-builtin-macro-redefined -Wno-missing-field-initializers -Wregister -Wstrict-overflow -Wno-unused-const-variable")
     endif ()
 elseif ("${CMAKE_CXX_COMPILER_ID} " MATCHES "Clang ")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdata-sections -fdiagnostics-color=always -ffunction-sections -fPIC -fstack-protector -fno-omit-frame-pointer -no-canonical-prefixes -O2 -std=c++17 -Wall -Wno-builtin-macro-redefined -Wno-deprecated-dynamic-exception-spec -Wno-enum-compare-switch -Wno-gnu-designator -Wno-missing-field-initializers -Wno-register -Wno-strict-overflow -Wno-unknown-warning-option -Wno-unneeded-internal-declaration -Wno-unused-const-variable -Wno-missing-braces")

diff --git a/cmake/MaliputMalidriveFlags.cmake b/cmake/MaliputMalidriveFlags.cmake
diff --git a/cmake/Utils.cmake b/cmake/Utils.cmake
diff --git a/cmake/cmake_uninstall.cmake.in b/cmake/cmake_uninstall.cmake.in
diff --git a/cmake/malidrive-malidrive-config.cmake.in b/cmake/malidrive-malidrive-config.cmake.in