diff options
| author | David Cole <david.cole@kitware.com> | 2012-01-17 21:23:16 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-01-17 21:23:16 (GMT) |
| commit | f1f66c95ad9b35e74547a9c3af1e7315eb0b738b (patch) | |
| tree | 44f63b767f5b7d3eb7b2df6e84115d0edc906641 | |
| parent | 4dd47eb6c394c54bde00ebd0d99a8c01c7128b9f (diff) | |
| parent | 4ac6ba2bb8d032cf8a6f5d3073ee8ad3853e0313 (diff) | |
| download | CMake-f1f66c95ad9b35e74547a9c3af1e7315eb0b738b.zip CMake-f1f66c95ad9b35e74547a9c3af1e7315eb0b738b.tar.gz CMake-f1f66c95ad9b35e74547a9c3af1e7315eb0b738b.tar.bz2 | |
Merge topic 'ExternalProject-git-cmd-version'
4ac6ba2 ExternalProject: Update copyright year
8cb8ccc ExternalProject: Fix git.cmd version detection
| -rw-r--r-- | Modules/ExternalProject.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake index a37771b..fb55d3b 100644 --- a/Modules/ExternalProject.cmake +++ b/Modules/ExternalProject.cmake @@ -144,7 +144,7 @@ # 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"); # see accompanying file Copyright.txt for details. @@ -954,6 +954,7 @@ function(_ep_get_git_version git_EXECUTABLE git_version_var) execute_process( COMMAND "${git_EXECUTABLE}" --version OUTPUT_VARIABLE ov + ERROR_VARIABLE ev OUTPUT_STRIP_TRAILING_WHITESPACE ) string(REGEX REPLACE "^git version (.+)$" "\\1" version "${ov}") |