diff options
| author | Brad King <brad.king@kitware.com> | 2019-03-15 14:14:54 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-03-15 14:16:06 (GMT) |
| commit | 41d796c09be11da2284182e7da7f79940e86e07b (patch) | |
| tree | c11f4758e28b4fa2bd3a81663efc23006ed56575 | |
| parent | 164261910d573605b437e7abace210ea8e80e598 (diff) | |
| parent | 28ae243ca695915b3e7d572ab70ca74db56f1d36 (diff) | |
| download | CMake-41d796c09be11da2284182e7da7f79940e86e07b.zip CMake-41d796c09be11da2284182e7da7f79940e86e07b.tar.gz CMake-41d796c09be11da2284182e7da7f79940e86e07b.tar.bz2 | |
Merge topic 'test-FindGTK2-explicit'
28ae243ca6 Tests: Run FindGTK2 tests only when explicitly enabled
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !3100
| -rw-r--r-- | Tests/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | Tests/RunCMake/CMakeLists.txt | 3 |
2 files changed, 5 insertions, 7 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 1b5ed03..01f8226 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -1454,6 +1454,10 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release add_subdirectory(GoogleTest) endif() + if(CMake_TEST_FindGTK2) + add_subdirectory(FindGTK2) + endif() + if(CMake_TEST_FindIconv) add_subdirectory(FindIconv) endif() @@ -1597,11 +1601,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release ADD_TEST_MACRO(FindMatlab.r2018a_check ${CMAKE_CTEST_COMMAND} -V -C $<CONFIGURATION>) endif() - find_package(GTK2 QUIET) - if(GTK2_FOUND) - add_subdirectory(FindGTK2) - endif() - add_test(ExternalProject ${CMAKE_CTEST_COMMAND} --build-and-test "${CMake_SOURCE_DIR}/Tests/ExternalProject" diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index f2b7ff1..afa8df7 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -339,8 +339,7 @@ if(PKG_CONFIG_FOUND) add_RunCMake_test(FindPkgConfig) endif() -find_package(GTK2 QUIET) -if (GTK2_FOUND) +if(CMake_TEST_FindGTK2) add_RunCMake_test(FindGTK2) endif() |