kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ExternalProject: Use GIT_VERSION_STRING instead of custom method 

GIT_VERSION_STRING is available in FindGit.cmake since CMake version 2.8.8
This commit is contained in:
Daniele E. Domenichelli 2015-09-17 11:19:36 +02:00
parent 6fd548f220
commit b04c38159e
1 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Modules/ExternalProject.cmake
View File

@ -1631,20 +1631,6 @@ function(_ep_add_mkdir_command name)
endfunction() endfunction()
function(_ep_get_git_version git_EXECUTABLE git_version_var)
if(git_EXECUTABLE)
execute_process(
COMMAND "${git_EXECUTABLE}" --version
OUTPUT_VARIABLE ov
ERROR_VARIABLE ev
OUTPUT_STRIP_TRAILING_WHITESPACE
)
string(REGEX REPLACE "^git version (.+)$" "\\1" version "${ov}")
set(${git_version_var} "${version}" PARENT_SCOPE)
endif()
endfunction()
function(_ep_is_dir_empty dir empty_var) function(_ep_is_dir_empty dir empty_var)
file(GLOB gr "${dir}/*") file(GLOB gr "${dir}/*")
if("${gr}" STREQUAL "") if("${gr}" STREQUAL "")
@ -1747,8 +1733,7 @@ function(_ep_add_download_command name)
# The git submodule update '--recursive' flag requires git >= v1.6.5 # The git submodule update '--recursive' flag requires git >= v1.6.5
# #
_ep_get_git_version("${GIT_EXECUTABLE}" git_version) if(GIT_VERSION_STRING VERSION_LESS 1.6.5)
if(git_version VERSION_LESS 1.6.5)
message(FATAL_ERROR "error: git version 1.6.5 or later required for 'git submodule update --recursive': git_version='${git_version}'") message(FATAL_ERROR "error: git version 1.6.5 or later required for 'git submodule update --recursive': git_version='${git_version}'")
endif() endif()