Hi,
I enclosed patch with update to CMake documentation, correct HOST/TARGET system
related variables
description.
Regards
Jiri
>From 7aae7428941581dd7199dfdb9325fd5cc599bed6 Mon Sep 17 00:00:00 2001
From: Jiri Malak <[email protected]>
Date: Sat, 1 Mar 2014 13:24:27 +0100
Subject: [PATCH] Update to documentation
Update to documentation for HOST/TARGET system related variables to be consistent with current functionality.
---
Help/variable/CMAKE_HOST_SYSTEM.rst | 8 +++++---
Help/variable/CMAKE_HOST_SYSTEM_NAME.rst | 5 +++--
Help/variable/CMAKE_HOST_SYSTEM_PROCESSOR.rst | 5 +++--
Help/variable/CMAKE_HOST_SYSTEM_VERSION.rst | 7 ++++---
Help/variable/CMAKE_SYSTEM.rst | 4 ++--
Help/variable/CMAKE_SYSTEM_NAME.rst | 7 +++----
Help/variable/CMAKE_SYSTEM_PROCESSOR.rst | 5 ++---
Help/variable/CMAKE_SYSTEM_VERSION.rst | 7 +++----
8 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/Help/variable/CMAKE_HOST_SYSTEM.rst b/Help/variable/CMAKE_HOST_SYSTEM.rst
index 4366ee3..153c612 100644
--- a/Help/variable/CMAKE_HOST_SYSTEM.rst
+++ b/Help/variable/CMAKE_HOST_SYSTEM.rst
@@ -1,7 +1,9 @@
CMAKE_HOST_SYSTEM
-----------------
-Name of system cmake is being run on.
+Composit Name of OS CMake is being run on.
-The same as CMAKE_SYSTEM but for the host system instead of the target
-system when cross compiling.
+This variable is the composite of CMAKE_HOST_SYSTEM_NAME and
+CMAKE_HOST_SYSTEM_VERSION, like this
+${CMAKE_HOST_SYSTEM_NAME}-${CMAKE_HOST_SYSTEM_VERSION}. If CMAKE_HOST_SYSTEM_VERSION
+is not set, then CMAKE_HOST_SYSTEM is the same as CMAKE_HOST_SYSTEM_NAME.
diff --git a/Help/variable/CMAKE_HOST_SYSTEM_NAME.rst b/Help/variable/CMAKE_HOST_SYSTEM_NAME.rst
index 718208a..99503d3 100644
--- a/Help/variable/CMAKE_HOST_SYSTEM_NAME.rst
+++ b/Help/variable/CMAKE_HOST_SYSTEM_NAME.rst
@@ -3,5 +3,6 @@ CMAKE_HOST_SYSTEM_NAME
Name of the OS CMake is running on.
-The same as CMAKE_SYSTEM_NAME but for the host system instead of the
-target system when cross compiling.
+On systems that have the uname command, this variable is set to the
+output of uname -s. Linux, Windows, and Darwin for Mac OS X are the
+values found on the big three operating systems.
diff --git a/Help/variable/CMAKE_HOST_SYSTEM_PROCESSOR.rst b/Help/variable/CMAKE_HOST_SYSTEM_PROCESSOR.rst
index 2700b66..3747051 100644
--- a/Help/variable/CMAKE_HOST_SYSTEM_PROCESSOR.rst
+++ b/Help/variable/CMAKE_HOST_SYSTEM_PROCESSOR.rst
@@ -3,5 +3,6 @@ CMAKE_HOST_SYSTEM_PROCESSOR
The name of the CPU CMake is running on.
-The same as CMAKE_SYSTEM_PROCESSOR but for the host system instead of
-the target system when cross compiling.
+On systems that support uname, this variable is set to the output of
+uname -p, on windows it is set to the value of the environment
+variable PROCESSOR_ARCHITECTURE
diff --git a/Help/variable/CMAKE_HOST_SYSTEM_VERSION.rst b/Help/variable/CMAKE_HOST_SYSTEM_VERSION.rst
index a8451e8..33d1d7c 100644
--- a/Help/variable/CMAKE_HOST_SYSTEM_VERSION.rst
+++ b/Help/variable/CMAKE_HOST_SYSTEM_VERSION.rst
@@ -1,7 +1,8 @@
CMAKE_HOST_SYSTEM_VERSION
-------------------------
-OS version CMake is running on.
+The OS version CMake is running on.
-The same as CMAKE_SYSTEM_VERSION but for the host system instead of
-the target system when cross compiling.
+A numeric version string for the system. On systems that support
+uname, this variable is set to the output of uname -r. On other
+systems this is set to major-minor version numbers.
diff --git a/Help/variable/CMAKE_SYSTEM.rst b/Help/variable/CMAKE_SYSTEM.rst
index 283d0be..81e81f0 100644
--- a/Help/variable/CMAKE_SYSTEM.rst
+++ b/Help/variable/CMAKE_SYSTEM.rst
@@ -1,9 +1,9 @@
CMAKE_SYSTEM
------------
-Name of system cmake is compiling for.
+Composit Name of OS CMake is compiling for.
This variable is the composite of CMAKE_SYSTEM_NAME and
CMAKE_SYSTEM_VERSION, like this
-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_VERSION}. If CMAKE_SYSTEM_VERSION
+${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_VERSION}. If CMAKE_SYSTEM_VERSION
is not set, then CMAKE_SYSTEM is the same as CMAKE_SYSTEM_NAME.
diff --git a/Help/variable/CMAKE_SYSTEM_NAME.rst b/Help/variable/CMAKE_SYSTEM_NAME.rst
index 9871dd9..47f4644 100644
--- a/Help/variable/CMAKE_SYSTEM_NAME.rst
+++ b/Help/variable/CMAKE_SYSTEM_NAME.rst
@@ -3,7 +3,6 @@ CMAKE_SYSTEM_NAME
Name of the OS CMake is building for.
-This is the name of the operating system on which CMake is targeting.
-On systems that have the uname command, this variable is set to the
-output of uname -s. Linux, Windows, and Darwin for Mac OS X are the
-values found on the big three operating systems.
+This is the name of the OS on which CMake is targeting.
+The same as CMAKE_HOST_SYSTEM_NAME if you build for the host system instead of the
+target system when cross compiling.
diff --git a/Help/variable/CMAKE_SYSTEM_PROCESSOR.rst b/Help/variable/CMAKE_SYSTEM_PROCESSOR.rst
index 1655ada..ae3b1ee 100644
--- a/Help/variable/CMAKE_SYSTEM_PROCESSOR.rst
+++ b/Help/variable/CMAKE_SYSTEM_PROCESSOR.rst
@@ -3,6 +3,5 @@ CMAKE_SYSTEM_PROCESSOR
The name of the CPU CMake is building for.
-On systems that support uname, this variable is set to the output of
-uname -p, on windows it is set to the value of the environment
-variable PROCESSOR_ARCHITECTURE
+The same as CMAKE_HOST_SYSTEM_PROCESSOR if you build for the host system instead of
+the target system when cross compiling.
diff --git a/Help/variable/CMAKE_SYSTEM_VERSION.rst b/Help/variable/CMAKE_SYSTEM_VERSION.rst
index 61bb40e..f760bd6 100644
--- a/Help/variable/CMAKE_SYSTEM_VERSION.rst
+++ b/Help/variable/CMAKE_SYSTEM_VERSION.rst
@@ -1,8 +1,7 @@
CMAKE_SYSTEM_VERSION
--------------------
-OS version CMake is building for.
+The OS version CMake is building for.
-A numeric version string for the system, on systems that support
-uname, this variable is set to the output of uname -r. On other
-systems this is set to major-minor version numbers.
+The same as CMAKE_HOST_SYSTEM_VERSION if you build for the host system instead of
+the target system when cross compiling.
--
1.8.0.msysgit.0
--
Powered by www.kitware.com
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Follow this link to subscribe/unsubscribe:
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
