[Cmake-commits] CMake branch, next, updated. v3.4.0-1368-g73a3b5a

[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  73a3b5a9c0288b5535e7d0b677b2a576dc2249e6 (commit)
       via  05d5d46051003f3b1d8fc89e21519ecbc7ca7ab2 (commit)
      from  9c717752e61305cfd522380ba7e9bcc40a95cdb9 (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=73a3b5a9c0288b5535e7d0b677b2a576dc2249e6
commit 73a3b5a9c0288b5535e7d0b677b2a576dc2249e6
Merge: 9c71775 05d5d46
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Fri Nov 13 15:23:00 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Nov 13 15:23:00 2015 -0500

    Merge topic 'add-cray-linux-platform' into next
    
    05d5d460 Cray: Added documentation for cross compiling on a Cray


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=05d5d46051003f3b1d8fc89e21519ecbc7ca7ab2
commit 05d5d46051003f3b1d8fc89e21519ecbc7ca7ab2
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Fri Nov 13 14:37:56 2015 -0500
Commit:     Chuck Atkins <chuck.atkins at kitware.com>
CommitDate: Fri Nov 13 15:22:45 2015 -0500

    Cray: Added documentation for cross compiling on a Cray

diff --git a/Help/manual/cmake-toolchains.7.rst b/Help/manual/cmake-toolchains.7.rst
index 492fcac..7b294a8 100644
--- a/Help/manual/cmake-toolchains.7.rst
+++ b/Help/manual/cmake-toolchains.7.rst
@@ -151,6 +151,36 @@ 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 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
+Cray Programming Environment's ``PrgEnv-*`` modules if present and loaded.
+
+The default configuration of the Cray Programming Environment is to only
+support static libraries.  This can be overridden and shared libraries
+enabled by setting the ``CRAYPE_LINK_TYPE`` environment variable to
+``dynamic``.
+
+Running CMake without specifying :variable:`CMAKE_SYSTEM_NAME` will
+run the configure step in host mode assuming a standard Linux environment.
+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
+software for a login node, you will need to either first unload the
+currently loaded ``PrgEnv-*`` module or explicitly tell CMake to use the
+system compilers in ``/usr/bin`` instead of the Cray wrappers.  If instead
+targeting a compute node is desired, just specify the
+:variable:`CMAKE_SYSTEM_NAME` as mentioned above.
+
 Cross Compiling using Clang
 ---------------------------
 
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:


hooks/post-receive
-- 
CMake