[Cmake-commits] CMake branch, next, updated. v3.5.1-961-gfb41aa9

[Brad King]

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  fb41aa96c50f47b76e20810d21e3ea958b0e0ff8 (commit)
       via  67e81c00828fa56a9f7bf8767f39f6cde398d63b (commit)
      from  583510b118ca4d465496e348f85af5e2d2355b10 (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=fb41aa96c50f47b76e20810d21e3ea958b0e0ff8
commit fb41aa96c50f47b76e20810d21e3ea958b0e0ff8
Merge: 583510b 67e81c0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 15 13:25:00 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 15 13:25:00 2016 -0400

    Merge topic 'cmake-host-solaris' into next
    
    67e81c00 Solaris: Add a CMAKE_HOST_SOLARIS variable (#16061)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=67e81c00828fa56a9f7bf8767f39f6cde398d63b
commit 67e81c00828fa56a9f7bf8767f39f6cde398d63b
Author:     Stafen Teleman <stefan.teleman at oracle.com>
AuthorDate: Tue Mar 8 06:36:22 2016 -0800
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Apr 15 13:19:39 2016 -0400

    Solaris: Add a CMAKE_HOST_SOLARIS variable (#16061)

diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst
index 7cf3a3d..fc1dc9f 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -175,6 +175,7 @@ Variables that Describe the System
    /variable/CMAKE_CL_64
    /variable/CMAKE_COMPILER_2005
    /variable/CMAKE_HOST_APPLE
+   /variable/CMAKE_HOST_SOLARIS
    /variable/CMAKE_HOST_SYSTEM_NAME
    /variable/CMAKE_HOST_SYSTEM_PROCESSOR
    /variable/CMAKE_HOST_SYSTEM
diff --git a/Help/release/dev/cmake-host-solaris.rst b/Help/release/dev/cmake-host-solaris.rst
new file mode 100644
index 0000000..da7ab89
--- /dev/null
+++ b/Help/release/dev/cmake-host-solaris.rst
@@ -0,0 +1,5 @@
+cmake-host-solaris
+------------------
+
+* A new :variable:`CMAKE_HOST_SOLARIS` variable was introduced to
+  indicate when CMake is running on an Oracle Solaris host.
diff --git a/Help/variable/CMAKE_HOST_SOLARIS.rst b/Help/variable/CMAKE_HOST_SOLARIS.rst
new file mode 100644
index 0000000..82b5d69
--- /dev/null
+++ b/Help/variable/CMAKE_HOST_SOLARIS.rst
@@ -0,0 +1,6 @@
+CMAKE_HOST_SOLARIS
+------------------
+
+``True`` for Oracle Solaris operating systems.
+
+Set to ``true`` when the host system is Oracle Solaris.
diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index be8e418..7670c10 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -1425,6 +1425,9 @@ void cmState::Snapshot::SetDefaultDefinitions()
     this->SetDefinition("APPLE", "1");
     this->SetDefinition("CMAKE_HOST_APPLE", "1");
   #endif
+  #if defined(__sun__)
+    this->SetDefinition("CMAKE_HOST_SOLARIS", "1");
+  #endif
 
     char temp[1024];
     sprintf(temp, "%d", cmVersion::GetMinorVersion());

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

Summary of changes:
 Help/manual/cmake-variables.7.rst       |    1 +
 Help/release/dev/cmake-host-solaris.rst |    5 +++++
 Help/variable/CMAKE_HOST_SOLARIS.rst    |    6 ++++++
 Source/cmState.cxx                      |    3 +++
 4 files changed, 15 insertions(+)
 create mode 100644 Help/release/dev/cmake-host-solaris.rst
 create mode 100644 Help/variable/CMAKE_HOST_SOLARIS.rst


hooks/post-receive
-- 
CMake