diff options
| author | Brad King <brad.king@kitware.com> | 2016-04-18 12:57:29 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-04-18 12:57:29 (GMT) |
| commit | f5c8a46808dcf55652fe6bb13fca70bd241d5d46 (patch) | |
| tree | 9c53bb3b43a5626d512b5ae1bb563dcc7fc21d49 | |
| parent | 0f6a8f7a46f91be249199b356f0cb9b2b508f6b0 (diff) | |
| parent | 5dc6cfd6ea304c6eb49e7f4555d6d9778854929b (diff) | |
| download | CMake-f5c8a46808dcf55652fe6bb13fca70bd241d5d46.zip CMake-f5c8a46808dcf55652fe6bb13fca70bd241d5d46.tar.gz CMake-f5c8a46808dcf55652fe6bb13fca70bd241d5d46.tar.bz2 | |
Merge topic 'cmake-host-solaris'
5dc6cfd6 Solaris: Add a CMAKE_HOST_SOLARIS variable (#16061)
| -rw-r--r-- | Help/manual/cmake-variables.7.rst | 1 | ||||
| -rw-r--r-- | Help/release/dev/cmake-host-solaris.rst | 5 | ||||
| -rw-r--r-- | Help/variable/CMAKE_HOST_SOLARIS.rst | 6 | ||||
| -rw-r--r-- | Source/cmState.cxx | 3 |
4 files changed, 15 insertions, 0 deletions
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()); |