[Cmake-commits] CMake branch, next, updated. v3.4.0-1370-g9adc7f6
Chuck Atkins
chuck.atkins at kitware.com
Sat Nov 14 11:34:09 EST 2015
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 9adc7f65f8ed81258090695833177fd4cbf811c2 (commit)
via 6458382373c381fa7a1c99a052b7c7c3e929dd8d (commit)
from 73a3b5a9c0288b5535e7d0b677b2a576dc2249e6 (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=9adc7f65f8ed81258090695833177fd4cbf811c2
commit 9adc7f65f8ed81258090695833177fd4cbf811c2
Merge: 73a3b5a 6458382
Author: Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Sat Nov 14 11:34:08 2015 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Nov 14 11:34:08 2015 -0500
Merge topic 'add-cray-linux-platform' into next
64583823 Cray: fix typo
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6458382373c381fa7a1c99a052b7c7c3e929dd8d
commit 6458382373c381fa7a1c99a052b7c7c3e929dd8d
Author: Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Sat Nov 14 11:33:24 2015 -0500
Commit: Chuck Atkins <chuck.atkins at kitware.com>
CommitDate: Sat Nov 14 11:33:24 2015 -0500
Cray: fix typo
diff --git a/Modules/Platform/CrayLinuxEnvironment.cmake b/Modules/Platform/CrayLinuxEnvironment.cmake
index 406b03a..19a0f71 100644
--- a/Modules/Platform/CrayLinuxEnvironment.cmake
+++ b/Modules/Platform/CrayLinuxEnvironment.cmake
@@ -97,7 +97,8 @@ list(APPEND CMAKE_Fortran_IMPLICIT_INCLUDE_DIRECTORIES
# Enable use of lib64 search path variants by default.
set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS TRUE)
-# Check to see if we're using the cray compiler wrapers and load accordingly if we are
+# Check to see if we're using the cray compiler wrappers and load accordingly
+# if we are
if(DEFINED ENV{CRAYPE_DIR})
set(_CRAYPE_ROOT "$ENV{CRAYPE_DIR}")
elseif(DEFINED ENV{ASYNCPE_DIR})
-----------------------------------------------------------------------
Summary of changes:
Modules/Platform/CrayLinuxEnvironment.cmake | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list