[Cmake-commits] CMake branch, next, updated. v2.8.7-2056-g8dabcd6

Brad King brad.king at kitware.com
Tue Jan 10 15:04:18 EST 2012


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  8dabcd63ee6f802781785d815550b90a05aa18a8 (commit)
       via  4ac6ba2bb8d032cf8a6f5d3073ee8ad3853e0313 (commit)
       via  8cb8ccc5712da169518bb5be7c23bd7d20530818 (commit)
      from  283358528a4600dfcca08df7338cc10588b3c532 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8dabcd63ee6f802781785d815550b90a05aa18a8
commit 8dabcd63ee6f802781785d815550b90a05aa18a8
Merge: 2833585 4ac6ba2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 10 15:04:03 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 10 15:04:03 2012 -0500

    Merge topic 'ExternalProject-git-cmd-version' into next
    
    4ac6ba2 ExternalProject: Update copyright year
    8cb8ccc ExternalProject: Fix git.cmd version detection


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4ac6ba2bb8d032cf8a6f5d3073ee8ad3853e0313
commit 4ac6ba2bb8d032cf8a6f5d3073ee8ad3853e0313
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 10 15:02:56 2012 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 10 15:02:56 2012 -0500

    ExternalProject: Update copyright year

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 308dc70..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.

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8cb8ccc5712da169518bb5be7c23bd7d20530818
commit 8cb8ccc5712da169518bb5be7c23bd7d20530818
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 10 14:38:22 2012 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 10 15:02:40 2012 -0500

    ExternalProject: Fix git.cmd version detection
    
    When GIT_EXECUTABLE points at ".../Git/cmd/git.cmd" in an msysGit
    installation we previously failed to detect the version number in a
    subtle case.  The "git.cmd" assumes 'chcp' is in PATH.  It is typically
    available at "C:\Windows\System32\chcp.com".  On 64-bit Windows the File
    System Redirector maps this location to "C:\Windows\SysWOW64\chcp.com"
    for 32-bit processes.  However, some Windows installations fail to
    provide chcp.com at this path.  Whenever git.cmd runs in a 32-bit
    command shell, as it does under a 32-bit CMake binary, it reports
    
     'chcp' is not recognized as an internal or external command,
      operable program or batch file.
    
    on stderr.  Capture stderr separately so it does not affect parsing
    of the version number.
    
    See also msysGit issue 358:
    
      http://code.google.com/p/msysgit/issues/detail?id=358
    
    Note that FindGit prefers "git.cmd" over "git.exe" because it sets up
    the proper HOME environment variable necessary for Git ssh connections
    to work the same as they do from the Git bash prompt.

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index a37771b..308dc70 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -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}")

-----------------------------------------------------------------------

Summary of changes:
 Modules/ExternalProject.cmake |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list