[Cmake-commits] CMake branch, master, updated. v3.8.1-1271-g150d9da

Kitware Robot kwrobot at kitware.com
Tue May 23 14:15:02 EDT 2017


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, master has been updated
       via  150d9daf89ab8148bdf90213ecf1cc90c2425d75 (commit)
       via  4edcc3750d27a2a939b56e8f8cabdd25fe403a94 (commit)
      from  346f1c0cf3dc543414692a56cb1b7bb4caf5417a (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=150d9daf89ab8148bdf90213ecf1cc90c2425d75
commit 150d9daf89ab8148bdf90213ecf1cc90c2425d75
Merge: 346f1c0 4edcc37
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 23 18:11:50 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue May 23 14:12:05 2017 -0400

    Merge topic 'darwin-bootstrap'
    
    4edcc375 bootstrap: prefer Clang over GNU on Darwin
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !878


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4edcc3750d27a2a939b56e8f8cabdd25fe403a94
commit 4edcc3750d27a2a939b56e8f8cabdd25fe403a94
Author:     Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Thu May 18 10:29:29 2017 -0600
Commit:     Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Mon May 22 22:56:55 2017 +0200

    bootstrap: prefer Clang over GNU on Darwin

diff --git a/bootstrap b/bootstrap
index e491cd8..b1f8670 100755
--- a/bootstrap
+++ b/bootstrap
@@ -860,7 +860,7 @@ cmake_toolchains=''
 case "${cmake_system}" in
   *AIX*)   cmake_toolchains='XL GNU' ;;
   *CYGWIN*) cmake_toolchains='GNU' ;;
-  *Darwin*) cmake_toolchains='GNU Clang' ;;
+  *Darwin*) cmake_toolchains='Clang GNU' ;;
   *Linux*) cmake_toolchains='GNU Clang XL PGI PathScale' ;;
   *MINGW*) cmake_toolchains='GNU' ;;
 esac

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

Summary of changes:
 bootstrap |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list