Merge pull request #62 from andrsd/test-config-gone

Removing config.h.in from tests
andrsd · Jul 9, 2024 · fc4d078 · fc4d078
2 parents 59b8d41 + a9d4c79
commit fc4d078
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -60,6 +60,9 @@ endif()
 # Tests
 
 if (EXODUSIICPP_BUILD_TESTS)
+    set(EXODUSIICPP_UNIT_TEST_ASSETS ${CMAKE_SOURCE_DIR}/test/assets CACHE PATH "" FORCE)
+    mark_as_advanced(FORCE EXODUSIICPP_UNIT_TEST_ASSETS)
+
     enable_testing()
     add_subdirectory(test)
 endif()

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -31,10 +31,10 @@ target_link_libraries(
         gmock_main
 )
 
-set(EXODUSIICPP_UNIT_TEST_ASSETS ${PROJECT_SOURCE_DIR}/assets CACHE PATH "" FORCE)
-mark_as_advanced(FORCE EXODUSIICPP_UNIT_TEST_ASSETS)
-
-configure_file(config.h.in config.h)
+target_compile_definitions(${PROJECT_NAME}
+    PRIVATE
+        -DEXODUSIICPP_UNIT_TEST_ASSETS="${EXODUSIICPP_UNIT_TEST_ASSETS}"
+)
 
 add_test(
     NAME ${PROJECT_NAME}

diff --git a/test/File_test.cpp b/test/File_test.cpp
@@ -1,6 +1,5 @@
 #include "gmock/gmock.h"
 #include "exodusIIcpp/exodusIIcpp.h"
-#include "config.h"
 
 using namespace exodusIIcpp;
 using namespace testing;

diff --git a/test/config.h.in b/test/config.h.in