[Cmake-commits] CMake branch, next, updated. v3.7.1-1780-g378ac83

Brad King brad.king at kitware.com
Thu Dec 15 09:59:39 EST 2016


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  378ac83b75d0e4b00eaf7e792cba01b2836aa33d (commit)
       via  caeb6d1dfb7ec9ab471d24e71244d7899f044c27 (commit)
      from  211b66d781ba2ebb690d4f24fd4d5327fd720ef5 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=378ac83b75d0e4b00eaf7e792cba01b2836aa33d
commit 378ac83b75d0e4b00eaf7e792cba01b2836aa33d
Merge: 211b66d caeb6d1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 15 09:59:38 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 15 09:59:38 2016 -0500

    Merge topic 'FindGit-fix-cross-compile' into next
    
    caeb6d1d FindGit: Fix check for Windows host


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=caeb6d1dfb7ec9ab471d24e71244d7899f044c27
commit caeb6d1dfb7ec9ab471d24e71244d7899f044c27
Author:     José Simões <jose.simoes at eclo.pt>
AuthorDate: Thu Dec 15 09:31:08 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Dec 15 09:57:30 2016 -0500

    FindGit: Fix check for Windows host
    
    When cross-compiling to or from a Windows platform we should still
    find a Git for the host environment.

diff --git a/Modules/FindGit.cmake b/Modules/FindGit.cmake
index 769c6c3..b830c08 100644
--- a/Modules/FindGit.cmake
+++ b/Modules/FindGit.cmake
@@ -30,7 +30,7 @@ set(git_names git eg)
 # Prefer .cmd variants on Windows unless running in a Makefile
 # in the MSYS shell.
 #
-if(WIN32)
+if(CMAKE_HOST_WIN32)
   if(NOT CMAKE_GENERATOR MATCHES "MSYS")
     set(git_names git.cmd git eg.cmd eg)
     # GitHub search path for Windows

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

Summary of changes:
 Modules/FindGit.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list