diff options
| author | Brad King <brad.king@kitware.com> | 2019-03-14 15:17:10 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-03-14 15:17:10 (GMT) |
| commit | 28ae243ca695915b3e7d572ab70ca74db56f1d36 (patch) | |
| tree | 4577a65fd6a44d169daa0eca6470a033686aa82b | |
| parent | 32a569e8771311348306f15644bfa048ee183892 (diff) | |
| download | CMake-28ae243ca695915b3e7d572ab70ca74db56f1d36.zip CMake-28ae243ca695915b3e7d572ab70ca74db56f1d36.tar.gz CMake-28ae243ca695915b3e7d572ab70ca74db56f1d36.tar.bz2 | |
Tests: Run FindGTK2 tests only when explicitly enabled
Do not `find_package(GTK2)` by default, as it gives the impression that
CMake depends on it to build. We will set `CMake_TEST_FindGTK2` in the
cache of automated builds where GTK2 is expected to work.
| -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() |