diff options
| author | Brad King <brad.king@kitware.com> | 2023-06-13 14:54:47 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-06-13 14:54:56 (GMT) |
| commit | cb5b148335af1466fcc9412c5fff0b4e6dbe8ebd (patch) | |
| tree | 8fc942a1f00c4e8838623da34f04dc0dd2b78c71 | |
| parent | 152be455055de9b3bcce4e79ac55896ed5a257a5 (diff) | |
| parent | 15d9d591bd8560284ec8b82b022ba0135ae58f82 (diff) | |
| download | CMake-cb5b148335af1466fcc9412c5fff0b4e6dbe8ebd.zip CMake-cb5b148335af1466fcc9412c5fff0b4e6dbe8ebd.tar.gz CMake-cb5b148335af1466fcc9412c5fff0b4e6dbe8ebd.tar.bz2 | |
Merge topic 'test-no-git' into release-3.27
15d9d591bd Tests: Require git to enable RunCMake.CMP0150 test
0c2610bd30 Tests: Find GIT_EXECUTABLE early enough to use in all tests
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8556
| -rw-r--r-- | Tests/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | Tests/RunCMake/CMakeLists.txt | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 5ef77fd..53bb1e6 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -142,6 +142,9 @@ if(BUILD_TESTING) ) endif() + # Look for git to use for tests. + find_program(GIT_EXECUTABLE NAMES git) + # Look for rpmbuild to use for tests. # The tool does not work with spaces in the path. if(NOT CMAKE_CURRENT_BINARY_DIR MATCHES " ") @@ -2688,10 +2691,6 @@ if(BUILD_TESTING) endif() # Test CTest Update with GIT - if(NOT DEFINED CMake_TEST_CTestUpdate_GIT OR CMake_TEST_CTestUpdate_GIT) - find_program(GIT_EXECUTABLE NAMES git) - mark_as_advanced(GIT_EXECUTABLE) - endif() if(NOT DEFINED CMake_TEST_CTestUpdate_GIT AND GIT_EXECUTABLE AND (UNIX OR NOT "${GIT_EXECUTABLE}" MATCHES "cygwin")) set(CMake_TEST_CTestUpdate_GIT 1) diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index d4f3341..f089a96 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -160,7 +160,10 @@ endif() add_RunCMake_test(CMP0132) add_RunCMake_test(CMP0135) add_RunCMake_test(CMP0139) -add_RunCMake_test(CMP0150) + +if(GIT_EXECUTABLE) + add_RunCMake_test(CMP0150) +endif() # The test for Policy 65 requires the use of the # CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS variable, which both the VS and Xcode |