diff options
| author | Brad King <brad.king@kitware.com> | 2019-05-31 13:03:16 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-05-31 13:03:28 (GMT) |
| commit | 0d025f75c14c0f5a7b7199a0712c958f5703c24e (patch) | |
| tree | 02d7512e17c6b1bf8d40a38c4252bf5d1caa5e69 /Tests/CMakeLists.txt | |
| parent | ebee9ff160569481aed4e0db5cbb3f3ac925c044 (diff) | |
| parent | 2d0b0e2b9d50aa14ccf345c727b2da73dfba9bd6 (diff) | |
| download | CMake-0d025f75c14c0f5a7b7199a0712c958f5703c24e.zip CMake-0d025f75c14c0f5a7b7199a0712c958f5703c24e.tar.gz CMake-0d025f75c14c0f5a7b7199a0712c958f5703c24e.tar.bz2 | |
Merge topic 'implicit-includes-CPATH'
2d0b0e2b9d Do not exclude include directories made implicit by CPATH
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3395
Diffstat (limited to 'Tests/CMakeLists.txt')
| -rw-r--r-- | Tests/CMakeLists.txt | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 6901077..920af04 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -3644,6 +3644,24 @@ ${CMake_SOURCE_DIR}/Utilities/Release/push.bash --dir dev -- '${CMake_BUILD_NIGH --test-command IncludeDirectories) list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/IncludeDirectories") + if(CMAKE_GENERATOR MATCHES "^((Unix|MSYS) Makefiles|Ninja)$" AND + ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.4) + OR (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT "x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC") + OR (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang"))) + add_test(IncludeDirectoriesCPATH ${CMAKE_CTEST_COMMAND} + --build-and-test + "${CMake_SOURCE_DIR}/Tests/IncludeDirectoriesCPATH" + "${CMake_BINARY_DIR}/Tests/IncludeDirectoriesCPATH" + --build-two-config + ${build_generator_args} + --build-project IncludeDirectoriesCPATH + --build-options ${build_options}) + list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/IncludeDirectoriesCPATH") + set_tests_properties(IncludeDirectoriesCPATH + PROPERTIES + ENVIRONMENT "CPATH=${CMAKE_CURRENT_SOURCE_DIR}/IncludeDirectoriesCPATH/viacpath") + endif() + add_test(InterfaceLinkLibraries ${CMAKE_CTEST_COMMAND} --build-and-test "${CMake_SOURCE_DIR}/Tests/InterfaceLinkLibraries" |