From 486b601ecb6d79c90eadc4dda0981e25e6a7ba1d Mon Sep 17 00:00:00 2001 From: Sander Vrijders Date: Thu, 3 Mar 2016 17:15:57 +0100 Subject: build: Move debugging switch to correct CMakeLists This moves the debugging switch down to the CMakeList associated with every program or library. It allows to build apps individually with debugging info on or off. --- CMakeLists.txt | 10 ---------- src/dad/CMakeLists.txt | 5 +++++ src/ipcpd/CMakeLists.txt | 5 +++++ src/irmd/CMakeLists.txt | 5 +++++ src/lib/CMakeLists.txt | 5 +++++ 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a1f19cf3..1bfbeb47 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,16 +47,6 @@ add_subdirectory(include) add_subdirectory(src) add_subdirectory(tests) -# FIXME: We may have to move this to the subdirs -include(MacroAddCompileFlags) -if (CMAKE_BUILD_TYPE MATCHES Debug) - MACRO_ADD_COMPILE_FLAGS(ipcpd -DCONFIG_OUROBOROS_DEBUG) - MACRO_ADD_COMPILE_FLAGS(irmd -DCONFIG_OUROBOROS_DEBUG) - MACRO_ADD_COMPILE_FLAGS(dad -DCONFIG_OUROBOROS_DEBUG) - MACRO_ADD_COMPILE_FLAGS(irm -DCONFIG_OUROBOROS_DEBUG) - MACRO_ADD_COMPILE_FLAGS(ouroboros -DCONFIG_OUROBOROS_DEBUG) -endif (CMAKE_BUILD_TYPE MATCHES Debug) - #include(FeatureSummary) #print_enabled_features() diff --git a/src/dad/CMakeLists.txt b/src/dad/CMakeLists.txt index 3d4b8ea7..ef0a3a1e 100644 --- a/src/dad/CMakeLists.txt +++ b/src/dad/CMakeLists.txt @@ -13,4 +13,9 @@ add_executable (dad ${SOURCE_FILES}) target_link_libraries (dad LINK_PUBLIC ouroboros) +include(MacroAddCompileFlags) +if (CMAKE_BUILD_TYPE MATCHES Debug) + MACRO_ADD_COMPILE_FLAGS(dad -DCONFIG_OUROBOROS_DEBUG) +endif (CMAKE_BUILD_TYPE MATCHES Debug) + install(TARGETS dad RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}) diff --git a/src/ipcpd/CMakeLists.txt b/src/ipcpd/CMakeLists.txt index 00ace9d5..8aec4a97 100644 --- a/src/ipcpd/CMakeLists.txt +++ b/src/ipcpd/CMakeLists.txt @@ -14,4 +14,9 @@ add_executable (ipcpd ${SOURCE_FILES}) target_link_libraries (ipcpd LINK_PUBLIC ouroboros) +include(MacroAddCompileFlags) +if (CMAKE_BUILD_TYPE MATCHES Debug) + MACRO_ADD_COMPILE_FLAGS(ipcpd -DCONFIG_OUROBOROS_DEBUG) +endif (CMAKE_BUILD_TYPE MATCHES Debug) + install(TARGETS ipcpd RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}) diff --git a/src/irmd/CMakeLists.txt b/src/irmd/CMakeLists.txt index bda793b7..fb777e3d 100644 --- a/src/irmd/CMakeLists.txt +++ b/src/irmd/CMakeLists.txt @@ -13,4 +13,9 @@ add_executable (irmd ${SOURCE_FILES}) target_link_libraries (irmd LINK_PUBLIC ouroboros) +include(MacroAddCompileFlags) +if (CMAKE_BUILD_TYPE MATCHES Debug) + MACRO_ADD_COMPILE_FLAGS(irmd -DCONFIG_OUROBOROS_DEBUG) +endif (CMAKE_BUILD_TYPE MATCHES Debug) + install(TARGETS irmd RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}) diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt index 2e0d6b6b..535726a9 100644 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -15,4 +15,9 @@ set(SOURCE_FILES add_library(ouroboros SHARED ${SOURCE_FILES}) +include(MacroAddCompileFlags) +if (CMAKE_BUILD_TYPE MATCHES Debug) + MACRO_ADD_COMPILE_FLAGS(ouroboros -DCONFIG_OUROBOROS_DEBUG) +endif (CMAKE_BUILD_TYPE MATCHES Debug) + install(TARGETS ouroboros LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}) -- cgit v1.2.3