Avoid to export Debug flags

bemanproject · Jan 20, 2025 · e84de4c · e84de4c
1 parent a7ee8c8
commit e84de4c
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -22,7 +22,7 @@ set(TARGETS_EXPORT_NAME ${PROJECT_NAME}-targets)
 include(GNUInstallDirs)
 set(INSTALL_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
 
-if(CMAKE_BUILD_TYPE STREQUAL xDebug)
+if(CMAKE_SKIP_INSTALL_RULES)
   include(FetchContent)
 
   # Add project_options from https://github.com/aminya/project_options
@@ -80,6 +80,10 @@ if(PROJECT_IS_TOP_LEVEL)
   add_subdirectory(examples)
 endif()
 
+if(CMAKE_SKIP_INSTALL_RULES)
+  return()
+endif()
+
 include(CMakePackageConfigHelpers)
 
 write_basic_package_version_file(

diff --git a/Makefile b/Makefile
@@ -79,8 +79,9 @@ doc:
 
 build:
 	CC=$(CXX) cmake --fresh -G Ninja -S $(SOURCEDIR) -B  $(BUILD) $(TOOLCHAIN) $(SYSROOT) \
-	  -DCMAKE_EXPORT_COMPILE_COMMANDS=1 \
-      -DCMAKE_CXX_COMPILER=$(CXX) # XXX -DCMAKE_CXX_FLAGS="$(CXX_FLAGS) $(SAN_FLAGS)"
+	  -D CMAKE_EXPORT_COMPILE_COMMANDS=1 \
+	  -D CMAKE_SKIP_INSTALL_RULES=1 \
+	  -D CMAKE_CXX_COMPILER=$(CXX) # XXX -D CMAKE_CXX_FLAGS="$(CXX_FLAGS) $(SAN_FLAGS)"
 	cmake --build $(BUILD)
 
 # NOTE: without install! CK

diff --git a/cmake/CMakeLinuxPresets.json b/cmake/CMakeLinuxPresets.json
@@ -20,8 +20,7 @@
       "name": "release-base-Linux",
       "hidden": true,
       "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "RelWithDebInfo",
-        "CMAKE_CXX_FLAGS": "-Wall -Wextra -Wpedantic -Wno-shadow -Wconversion -Wsign-conversion -Wcast-align -Wcast-qual -Woverloaded-virtual -Wformat=2 -Wno-error"
+        "CMAKE_BUILD_TYPE": "RelWithDebInfo"
       },
       "condition": {
         "type": "notEquals",

diff --git a/src/beman/execution26/CMakeLists.txt b/src/beman/execution26/CMakeLists.txt
@@ -6,7 +6,7 @@
 add_library(${TARGET_NAME} STATIC)
 add_library(${TARGET_ALIAS} ALIAS ${TARGET_NAME})
 
-if(CMAKE_BUILD_TYPE STREQUAL xDebug)
+if(CMAKE_SKIP_INSTALL_RULES)
   target_link_libraries(${TARGET_NAME} PUBLIC $<BUILD_INTERFACE:${TARGET_NAME}_project_options>)
   target_link_libraries(${TARGET_NAME} PUBLIC $<BUILD_INTERFACE:${TARGET_NAME}_project_warnings>)
 endif()
@@ -198,6 +198,10 @@ target_compile_features(${TARGET_NAME} PUBLIC
   "$<$<NOT:$<COMPILE_FEATURES:cxx_std_26>>:cxx_std_23>"
 )
 
+if(CMAKE_SKIP_INSTALL_RULES)
+  return()
+endif()
+
 install(
   TARGETS ${TARGET_NAME}
   EXPORT ${TARGETS_EXPORT_NAME}1

diff --git a/tests/beman/execution26/CMakeLists.txt b/tests/beman/execution26/CMakeLists.txt
@@ -129,7 +129,7 @@ foreach(test ${execution_tests})
   add_test(NAME ${TEST_EXE} COMMAND $<TARGET_FILE:${TEST_EXE}>)
 endforeach()
 
-if(ROJECT_IS_TOP_LEVEL)
+if(NOT ROJECT_IS_TOP_LEVEL)
   # test if the targets are findable from the build directory
   # cmake-format: off
   add_test(NAME find-package-test