Merge topic 'ExternalProject-git-cmd-version'
4ac6ba2 ExternalProject: Update copyright year 8cb8ccc ExternalProject: Fix git.cmd version detection
This commit is contained in:
commit
f1f66c95ad
@ -144,7 +144,7 @@
|
|||||||
# set_property(DIRECTORY PROPERTY EP_STEP_TARGETS configure build test)
|
# set_property(DIRECTORY PROPERTY EP_STEP_TARGETS configure build test)
|
||||||
|
|
||||||
#=============================================================================
|
#=============================================================================
|
||||||
# Copyright 2008-2009 Kitware, Inc.
|
# Copyright 2008-2012 Kitware, Inc.
|
||||||
#
|
#
|
||||||
# Distributed under the OSI-approved BSD License (the "License");
|
# Distributed under the OSI-approved BSD License (the "License");
|
||||||
# see accompanying file Copyright.txt for details.
|
# see accompanying file Copyright.txt for details.
|
||||||
@ -954,6 +954,7 @@ function(_ep_get_git_version git_EXECUTABLE git_version_var)
|
|||||||
execute_process(
|
execute_process(
|
||||||
COMMAND "${git_EXECUTABLE}" --version
|
COMMAND "${git_EXECUTABLE}" --version
|
||||||
OUTPUT_VARIABLE ov
|
OUTPUT_VARIABLE ov
|
||||||
|
ERROR_VARIABLE ev
|
||||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||||
)
|
)
|
||||||
string(REGEX REPLACE "^git version (.+)$" "\\1" version "${ov}")
|
string(REGEX REPLACE "^git version (.+)$" "\\1" version "${ov}")
|
||||||
|
Loading…
x
Reference in New Issue
Block a user