diff options
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Tests/CMakeLists.txt | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 173e923..fcb3174 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -342,6 +342,10 @@ SET(CMake_VERSION_FULL "${CMake_VERSION}.${CMake_VERSION_PATCH}") ENABLE_TESTING() INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake) +# Set up test-time configuration. +SET_DIRECTORY_PROPERTIES(PROPERTIES + TEST_INCLUDE_FILE "${CMake_BINARY_DIR}/Tests/EnforceConfig.cmake") + # where to write the resulting executables and libraries SET(BUILD_SHARED_LIBS OFF) SET(EXECUTABLE_OUTPUT_PATH "" CACHE INTERNAL "No configurable exe dir.") diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 2a31989..5fa4059 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -28,12 +28,8 @@ IF(NOT CMAKE_CONFIGURATION_TYPES AND CMAKE_BUILD_TYPE) SET(CTestTest_CONFIG ${CMAKE_BUILD_TYPE}) ENDIF() -# Make sure the 'testing' test gets a proper configuration. CONFIGURE_FILE(${CMake_SOURCE_DIR}/Tests/EnforceConfig.cmake.in ${CMake_BINARY_DIR}/Tests/EnforceConfig.cmake @ONLY) -SET_DIRECTORY_PROPERTIES(PROPERTIES - TEST_INCLUDE_FILE "${CMake_BINARY_DIR}/Tests/EnforceConfig.cmake" - ) # Testing IF(BUILD_TESTING) |