[Cmake-commits] CMake branch, next, updated. v3.3.2-3409-gffc7b31

[Brad King]

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  ffc7b31943346ec70de4537873d20ea98b76326c (commit)
       via  a244712902a31dd495434ecef5ab82a7b172c638 (commit)
      from  dd75fc27af2c737f0c6d78fe39578529ce5012da (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=ffc7b31943346ec70de4537873d20ea98b76326c
commit ffc7b31943346ec70de4537873d20ea98b76326c
Merge: dd75fc2 a244712
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 30 14:50:00 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 30 14:50:00 2015 -0400

    Merge topic 'cray-linux-compiler-wrappers' into next
    
    a2447129 fixup! Cray: Detect when compiler links static binaries


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a244712902a31dd495434ecef5ab82a7b172c638
commit a244712902a31dd495434ecef5ab82a7b172c638
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 30 14:48:58 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 30 14:48:58 2015 -0400

    fixup! Cray: Detect when compiler links static binaries

diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake
index 82b39bb..591ecb8 100644
--- a/Modules/CMakeDetermineCompilerId.cmake
+++ b/Modules/CMakeDetermineCompilerId.cmake
@@ -530,7 +530,7 @@ function(CMAKE_DETERMINE_COMPILER_ID_CHECK lang file)
       endif()
     endif()
 
-    if(DEFINED ENV{CRAYPE_VERSION})
+    if(UNIX)
       execute_process(COMMAND file "${file}" OUTPUT_VARIABLE out ERROR_VARIABLE out)
       if(out MATCHES "statically linked")
         set(CMAKE_${lang}_COMPILER_LINKS_STATICALLY 1 PARENT_SCOPE)

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

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


hooks/post-receive
-- 
CMake