[Cmake-commits] CMake branch, next, updated. v3.4.0-1366-g9c71775

Chuck Atkins chuck.atkins at kitware.com
Fri Nov 13 15:22:26 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  9c717752e61305cfd522380ba7e9bcc40a95cdb9 (commit)
       via  92b23ad8c22e384736b165214f1dddbcab5040c1 (commit)
      from  f53fe86cef5a6ff342d8ac5b931e1998e5b7744c (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=9c717752e61305cfd522380ba7e9bcc40a95cdb9
commit 9c717752e61305cfd522380ba7e9bcc40a95cdb9
Merge: f53fe86 92b23ad
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Fri Nov 13 15:22:25 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Nov 13 15:22:25 2015 -0500

    Merge topic 'add-cray-linux-platform' into next
    
    92b23ad8 Cray: Added release notes


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=92b23ad8c22e384736b165214f1dddbcab5040c1
commit 92b23ad8c22e384736b165214f1dddbcab5040c1
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Fri Nov 13 15:21:50 2015 -0500
Commit:     Chuck Atkins <chuck.atkins at kitware.com>
CommitDate: Fri Nov 13 15:21:50 2015 -0500

    Cray: Added release notes

diff --git a/Help/manual/cmake-toolchains.7.rst b/Help/manual/cmake-toolchains.7.rst
index 3d1973e..7b294a8 100644
--- a/Help/manual/cmake-toolchains.7.rst
+++ b/Help/manual/cmake-toolchains.7.rst
@@ -151,12 +151,14 @@ target system prefixes, whereas executables which must be run as part of the bui
 should be found only on the host and not on the target. This is the purpose of
 the ``CMAKE_FIND_ROOT_PATH_MODE_*`` variables.
 
+.. _`Cray Cross-Compile`:
+
 Cross Compiling for the Cray Linux Environment
 ----------------------------------------------
 
 Cross compiling for compute nodes in the Cray Linux Environment can be done
-without needing a seperate toolchain file.  Specifying
-``-DCMAKE_SYSTEM_NAME=CrayLinuxEnvironment`` on the CMake comamnd line will
+without needing a separate toolchain file.  Specifying
+``-DCMAKE_SYSTEM_NAME=CrayLinuxEnvironment`` on the CMake command line will
 ensure that the appropriate build settings and search paths are configured.
 The platform will pull its configuration from the current environment
 variables and will configure a project to use the compiler wrappers from the
@@ -169,7 +171,7 @@ enabled by setting the ``CRAYPE_LINK_TYPE`` environment variable to
 
 Running CMake without specifying :variable:`CMAKE_SYSTEM_NAME` will
 run the configure step in host mode assuming a standard Linux environment.
-If not overriden, the ``PrgEnv-*`` compiler wrappers will end up getting used,
+If not overridden, the ``PrgEnv-*`` compiler wrappers will end up getting used,
 which if targeting the either the login node or compute node, is likely not the
 desired behavior.  The exception to this would be if you are building directly
 on a NID instead of cross-compiling from a login node. If trying to build
diff --git a/Help/release/dev/add-cray-linux-platform.rst b/Help/release/dev/add-cray-linux-platform.rst
new file mode 100644
index 0000000..7000382
--- /dev/null
+++ b/Help/release/dev/add-cray-linux-platform.rst
@@ -0,0 +1,7 @@
+add-cray-linux-platform
+-----------------------
+
+* A new platform file for cross-compiling in the Cray Linux Environment to
+  target compute nodes was added.  See
+  :ref:`Cross Compiling for the Cray Linux Environment <Cray Cross-Compile>`
+  for usage details.

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

Summary of changes:
 Help/manual/cmake-toolchains.7.rst           |    8 +++++---
 Help/release/dev/add-cray-linux-platform.rst |    7 +++++++
 2 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 Help/release/dev/add-cray-linux-platform.rst


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list