diff options
| author | Brad King <brad.king@kitware.com> | 2021-01-21 14:26:53 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-01-21 14:27:04 (GMT) |
| commit | c69567e56a3b4ba4eb6e02112b95c0143894d598 (patch) | |
| tree | cad9faf9029e5d9f18165b1fa1353783622ecca2 /Tests/ExternalProjectUpdate/ExternalProjectUpdateTest.cmake | |
| parent | 8cdb9de586745f4935b30f6687a131a91234d646 (diff) | |
| parent | 76fdeb6d13c4cfdaac8e933a9ef94c8e9def54ef (diff) | |
| download | CMake-c69567e56a3b4ba4eb6e02112b95c0143894d598.zip CMake-c69567e56a3b4ba4eb6e02112b95c0143894d598.tar.gz CMake-c69567e56a3b4ba4eb6e02112b95c0143894d598.tar.bz2 | |
Merge topic 'FindGit-cache-version'
76fdeb6d13 Tests: FindGit already provides the git version, re-use it
315a200f0c FindGit: Cache the GIT_EXECUTABLE version for the current run
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5712
Diffstat (limited to 'Tests/ExternalProjectUpdate/ExternalProjectUpdateTest.cmake')
| -rw-r--r-- | Tests/ExternalProjectUpdate/ExternalProjectUpdateTest.cmake | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/Tests/ExternalProjectUpdate/ExternalProjectUpdateTest.cmake b/Tests/ExternalProjectUpdate/ExternalProjectUpdateTest.cmake index d300e8b..aaa05d7 100644 --- a/Tests/ExternalProjectUpdate/ExternalProjectUpdateTest.cmake +++ b/Tests/ExternalProjectUpdate/ExternalProjectUpdateTest.cmake @@ -167,15 +167,9 @@ set(do_git_tests 0) if(GIT_EXECUTABLE) set(do_git_tests 1) - execute_process( - COMMAND "${GIT_EXECUTABLE}" --version - OUTPUT_VARIABLE ov - OUTPUT_STRIP_TRAILING_WHITESPACE - ) - string(REGEX REPLACE "^git version (.+)$" "\\1" git_version "${ov}") - message(STATUS "git_version='${git_version}'") + message(STATUS "GIT_VERSION_STRING='${GIT_VERSION_STRING}'") - if(git_version VERSION_LESS 1.6.5) + if("${GIT_VERSION_STRING}" VERSION_LESS 1.6.5) message(STATUS "No ExternalProject git tests with git client less than version 1.6.5") set(do_git_tests 0) endif() |