[Cmake-commits] CMake branch, next, updated. v3.6.1-1128-g05c29d6

[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  05c29d64b440766b28622db87d5ab91069ec2af7 (commit)
       via  e52302d6cbee72c9d680affcf1f253bfa61f1891 (commit)
      from  f4cc3c36d7a704951d87abfd3031182871aa0d41 (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=05c29d64b440766b28622db87d5ab91069ec2af7
commit 05c29d64b440766b28622db87d5ab91069ec2af7
Merge: f4cc3c3 e52302d
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Fri Aug 5 09:02:49 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 5 09:02:49 2016 -0400

    Merge topic 'update-cle-version-info' into next
    
    e52302d6 CrayLinuxEnvironment: Add alternative methods to get version info


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e52302d6cbee72c9d680affcf1f253bfa61f1891
commit e52302d6cbee72c9d680affcf1f253bfa61f1891
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Thu Aug 4 14:46:10 2016 -0400
Commit:     Chuck Atkins <chuck.atkins at kitware.com>
CommitDate: Fri Aug 5 09:01:43 2016 -0400

    CrayLinuxEnvironment: Add alternative methods to get version info
    
    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 97771a2..a1a3d3f 100644
--- a/Modules/Platform/CrayLinuxEnvironment.cmake
+++ b/Modules/Platform/CrayLinuxEnvironment.cmake
@@ -8,14 +8,22 @@ if(DEFINED ENV{CRAYOS_VERSION})
   set(CMAKE_SYSTEM_VERSION "$ENV{CRAYOS_VERSION}")
 elseif(DEFINED ENV{XTOS_VERSION})
   set(CMAKE_SYSTEM_VERSION "$ENV{XTOS_VERSION}")
-else()
-  message(FATAL_ERROR "Neither the CRAYOS_VERSION or XTOS_VERSION environment variables are defined.  This platform file should be used inside the Cray Linux Environment for targeting compute nodes (NIDs)")
+elseif(EXISTS /etc/opt/cray/release/cle-release)
+  file(STRINGS /etc/opt/cray/release/cle-release release REGEX "^RELEASE=.*")
+  string(REGEX REPLACE "^RELEASE=(.*)$" "\\1" CMAKE_SYSTEM_VERSION "${release}")
+  unset(release)
+elseif(EXISTS /etc/opt/cray/release/clerelease)
+  file(READ /etc/opt/cray/release/clerelease CMAKE_SYSTEM_VERSION)
 endif()
 
 # Guard against multiple messages
 if(NOT __CrayLinuxEnvironment_message)
-  set(__CrayLinuxEnvironment_message 1)
-  message(STATUS "Cray Linux Environment ${CMAKE_SYSTEM_VERSION}")
+  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()
+    message(STATUS "Cray Linux Environment ${CMAKE_SYSTEM_VERSION}")
+  endif()
 endif()
 
 # All cray systems are x86 CPUs and have been for quite some time

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

Summary of changes:


hooks/post-receive
-- 
CMake