[Cmake-commits] CMake branch, next, updated. v3.5.1-963-g87bfd4e

[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  87bfd4ea4dd5c84df94434d2ed150038b4801945 (commit)
       via  5dc6cfd6ea304c6eb49e7f4555d6d9778854929b (commit)
      from  fb41aa96c50f47b76e20810d21e3ea958b0e0ff8 (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=87bfd4ea4dd5c84df94434d2ed150038b4801945
commit 87bfd4ea4dd5c84df94434d2ed150038b4801945
Merge: fb41aa9 5dc6cfd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 15 13:25:56 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 15 13:25:56 2016 -0400

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


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5dc6cfd6ea304c6eb49e7f4555d6d9778854929b
commit 5dc6cfd6ea304c6eb49e7f4555d6d9778854929b
Author:     Stafen Teleman <stefan.teleman at oracle.com>
AuthorDate: Wed Apr 13 12:36:36 2016 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Apr 15 13:25:45 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:


hooks/post-receive
-- 
CMake