diff options
| author | Brad King <brad.king@kitware.com> | 2020-06-26 13:31:14 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-06-26 13:31:20 (GMT) |
| commit | ba222d9fb0440c7cad845e2a01bd32fb454cc109 (patch) | |
| tree | b2c3f40cffd6d533598427c5eae2d43ea0d28633 /Tests | |
| parent | 5c7ce56bce6bd7c524117681d9fd7f02a07177be (diff) | |
| parent | 1458b4c048c4c68318f479569b91aeb9993439b8 (diff) | |
| download | CMake-ba222d9fb0440c7cad845e2a01bd32fb454cc109.zip CMake-ba222d9fb0440c7cad845e2a01bd32fb454cc109.tar.gz CMake-ba222d9fb0440c7cad845e2a01bd32fb454cc109.tar.bz2 | |
Merge topic 'GoogleTest-DISCOVERY_MODE-cleanups'
1458b4c048 Help: Add CMAKE_GTEST_DISCOVER_TESTS_DISCOVERY_MODE to release notes
642ea49115 GoogleTest: Replace SEND_ERROR with FATAL_ERROR
09c38e8de6 Tests: Don't ask for things not required for GoogleTest
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4938
Diffstat (limited to 'Tests')
4 files changed, 4 insertions, 8 deletions
diff --git a/Tests/RunCMake/GoogleTest/GoogleTest.cmake b/Tests/RunCMake/GoogleTest/GoogleTest.cmake index fca292a..6aa2658 100644 --- a/Tests/RunCMake/GoogleTest/GoogleTest.cmake +++ b/Tests/RunCMake/GoogleTest/GoogleTest.cmake @@ -1,5 +1,4 @@ -project(test_include_dirs) -include(CTest) +project(test_include_dirs LANGUAGES CXX) include(GoogleTest) enable_testing() diff --git a/Tests/RunCMake/GoogleTest/GoogleTestDiscoveryMultiConfig.cmake b/Tests/RunCMake/GoogleTest/GoogleTestDiscoveryMultiConfig.cmake index 1919dc1..df784fe 100644 --- a/Tests/RunCMake/GoogleTest/GoogleTestDiscoveryMultiConfig.cmake +++ b/Tests/RunCMake/GoogleTest/GoogleTestDiscoveryMultiConfig.cmake @@ -1,5 +1,4 @@ -project(test_include_dirs) -include(CTest) +project(test_include_dirs LANGUAGES CXX) include(GoogleTest) enable_testing() diff --git a/Tests/RunCMake/GoogleTest/GoogleTestDiscoveryTimeout.cmake b/Tests/RunCMake/GoogleTest/GoogleTestDiscoveryTimeout.cmake index 7398faf..20e9d65 100644 --- a/Tests/RunCMake/GoogleTest/GoogleTestDiscoveryTimeout.cmake +++ b/Tests/RunCMake/GoogleTest/GoogleTestDiscoveryTimeout.cmake @@ -1,5 +1,4 @@ -project(test_include_dirs) -include(CTest) +project(test_include_dirs LANGUAGES CXX) include(GoogleTest) enable_testing() diff --git a/Tests/RunCMake/GoogleTest/GoogleTestXML.cmake b/Tests/RunCMake/GoogleTest/GoogleTestXML.cmake index c86de63..29bd05e 100644 --- a/Tests/RunCMake/GoogleTest/GoogleTestXML.cmake +++ b/Tests/RunCMake/GoogleTest/GoogleTestXML.cmake @@ -1,5 +1,4 @@ -project(test_include_dirs) -include(CTest) +project(test_include_dirs LANGUAGES CXX) include(GoogleTest) enable_testing() |