[Cmake-commits] CMake branch, next, updated. v3.6.1-1126-gf4cc3c3

[Chuck Atkins]

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  f4cc3c36d7a704951d87abfd3031182871aa0d41 (commit)
       via  7e29fda9fc6f0081825d1961249d3e572f460b9f (commit)
      from  721ea794cd31ba2c2e96d35eb7b15d97db5c4642 (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=f4cc3c36d7a704951d87abfd3031182871aa0d41
commit f4cc3c36d7a704951d87abfd3031182871aa0d41
Merge: 721ea79 7e29fda
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Fri Aug 5 09:00:54 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 5 09:00:54 2016 -0400

    Merge topic 'update-cle-version-info' into next
    
    7e29fda9 Closes: #16229


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7e29fda9fc6f0081825d1961249d3e572f460b9f
commit 7e29fda9fc6f0081825d1961249d3e572f460b9f
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Fri Aug 5 08:58:27 2016 -0400
Commit:     Chuck Atkins <chuck.atkins at kitware.com>
CommitDate: Fri Aug 5 08:59:55 2016 -0400

    Closes: #16229

diff --git a/Modules/Compiler/CrayPrgEnv.cmake b/Modules/Compiler/CrayPrgEnv.cmake
index fa39b00..9f8befd 100644
--- a/Modules/Compiler/CrayPrgEnv.cmake
+++ b/Modules/Compiler/CrayPrgEnv.cmake
@@ -56,6 +56,8 @@ macro(__CrayPrgEnv_setup lang test_src compiler_cmd link_cmd)
     message(STATUS "Cray Programming Environment $ENV{CRAYPE_VERSION} ${lang}")
   elseif(DEFINED ENV{ASYNCPE_VERSION})
     message(STATUS "Cray XT Programming Environment $ENV{ASYNCPE_VERSION} ${lang}")
+  else()
+    message(STATUS "Cray Programming Environment (unknown version) ${lang}")
   endif()
 
   # Flags for the Cray wrappers
diff --git a/Modules/Platform/CrayLinuxEnvironment.cmake b/Modules/Platform/CrayLinuxEnvironment.cmake
index 301eb85..a1a3d3f 100644
--- a/Modules/Platform/CrayLinuxEnvironment.cmake
+++ b/Modules/Platform/CrayLinuxEnvironment.cmake
@@ -18,7 +18,7 @@ endif()
 
 # Guard against multiple messages
 if(NOT __CrayLinuxEnvironment_message)
-  set(__CrayLinuxEnvironment_message 1 CACHE BOOL "" FORCE)
+  set(__CrayLinuxEnvironment_message 1 CACHE INTERNAL "")
   if(NOT CMAKE_SYSTEM_VERSION)
     message(STATUS "CrayLinuxEnvironment: Unable to determine CLE version.  This platform file should only be used from inside the Cray Linux Environment for targeting compute nodes (NIDs).")
   else()

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

Summary of changes:
 Modules/Compiler/CrayPrgEnv.cmake           |    2 ++
 Modules/Platform/CrayLinuxEnvironment.cmake |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake