Merge pull request #1875 from thetic/degenerate

basvodde · web-flow · commit 91f527cf6471 · 2025-11-29T13:20:46.000+01:00
Remove generated header from CMake build
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -125,21 +125,12 @@ if(HAVE_SIZEOF_LONGLONG)
     set(CPPUTEST_HAVE_LONG_LONG_INT ON)
 endif()
 
-configure_file (
-    "${PROJECT_SOURCE_DIR}/config.h.cmake"
-    "${PROJECT_BINARY_DIR}/generated/CppUTestGeneratedConfig.h"
-)
-
 add_subdirectory(src)
 
 target_include_directories(CppUTest
     PUBLIC
         $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>
 )
-target_compile_definitions(CppUTest
-  PUBLIC
-    HAVE_CONFIG_H
-)
 
 if (CPPUTEST_BUILD_TESTING)
     add_subdirectory(tests)
diff --git a/cmake/install.cmake b/cmake/install.cmake
@@ -15,11 +15,6 @@ install(
     DESTINATION ${LIB_INSTALL_DIR}/pkgconfig
 )
 
-install(
-    FILES "${CMAKE_CURRENT_BINARY_DIR}/generated/CppUTestGeneratedConfig.h"
-    DESTINATION "${INCLUDE_INSTALL_DIR}/generated"
-)
-
 include(CMakePackageConfigHelpers)
 
 set(CPPUTEST_CONFIG_DEST "${LIB_INSTALL_DIR}/CppUTest/cmake")
diff --git a/config.h.cmake b/config.h.cmake
diff --git a/src/CppUTest/CMakeLists.txt b/src/CppUTest/CMakeLists.txt
@@ -76,7 +76,18 @@ target_include_directories(CppUTest
 )
 
 target_compile_definitions(CppUTest
+    PUBLIC
+        CPPUTEST_USE_MEM_LEAK_DETECTION=$<NOT:$<BOOL:${CPPUTEST_MEM_LEAK_DETECTION_DISABLED}>>
+        CPPUTEST_USE_LONG_LONG=$<BOOL:${CPPUTEST_USE_LONG_LONG}>
+        CPPUTEST_USE_STD_C_LIB=$<NOT:$<BOOL:${CPPUTEST_STD_C_LIB_DISABLED}>>
+        CPPUTEST_USE_STD_CPP_LIB=$<NOT:$<BOOL:${CPPUTEST_STD_CPP_LIB_DISABLED}>>
+        $<$<BOOL:${CPPUTEST_HAVE_STRDUP}>:CPPUTEST_HAVE_STRDUP>
+        $<$<BOOL:${CPPUTEST_HAVE_FORK}>:CPPUTEST_HAVE_FORK>
+        $<$<BOOL:${CPPUTEST_HAVE_WAITPID}>:CPPUTEST_HAVE_WAITPID>
+        $<$<BOOL:${CPPUTEST_HAVE_KILL}>:CPPUTEST_HAVE_KILL>
+        $<$<BOOL:${CPPUTEST_HAVE_PTHREAD_MUTEX_LOCK}>:CPPUTEST_HAVE_PTHREAD_MUTEX_LOCK>
     PRIVATE
+        $<$<BOOL:${CPPUTEST_HAVE_GETTIMEOFDAY}>:CPPUTEST_HAVE_GETTIMEOFDAY>
         $<$<BOOL:${CPPUTEST_USE_SECURE_STDLIB}>:STDC_WANT_SECURE_LIB>
         # Apply workaround for MinGW timespec redefinition (pthread.h / time.h).
         $<$<BOOL:${HAVE_STRUCT_TIMESPEC}>:_TIMESPEC_DEFINED>
