[Cmake-commits] CMake branch, next, updated. v3.0.0-4176-gccd2612

[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  ccd2612f1630cb99448e8cab2ff44fbf90a1dca4 (commit)
       via  d2f68588caba8f9df5756fc5c52d6e54d2caa6a5 (commit)
      from  de47322e69c37221b19f85b0a490a77a2e1646ec (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ccd2612f1630cb99448e8cab2ff44fbf90a1dca4
commit ccd2612f1630cb99448e8cab2ff44fbf90a1dca4
Merge: de47322 d2f6858
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 10 10:45:08 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 10 10:45:08 2014 -0400

    Merge topic 'doc-CMAKE_LANG_PLATFORM_ID' into next
    
    d2f68588 Help: Document possible values of CMAKE_<LANG>_PLATFORM_ID (#15012)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d2f68588caba8f9df5756fc5c52d6e54d2caa6a5
commit d2f68588caba8f9df5756fc5c52d6e54d2caa6a5
Author:     Philipp Moeller <bootsarehax at gmail.com>
AuthorDate: Thu Jul 10 10:38:50 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jul 10 10:45:17 2014 -0400

    Help: Document possible values of CMAKE_<LANG>_PLATFORM_ID (#15012)
    
    Also add a note for anyone who might change CMakePlatformId.h.in to keep
    the documentation up to date.

diff --git a/Help/variable/CMAKE_LANG_PLATFORM_ID.rst b/Help/variable/CMAKE_LANG_PLATFORM_ID.rst
index 1b243e3..f50e480 100644
--- a/Help/variable/CMAKE_LANG_PLATFORM_ID.rst
+++ b/Help/variable/CMAKE_LANG_PLATFORM_ID.rst
@@ -1,6 +1,40 @@
 CMAKE_<LANG>_PLATFORM_ID
 ------------------------
 
-An internal variable subject to change.
+Platform identification string.
 
-This is used in determining the platform and is subject to change.
+A short string unique to the platform.  Possible values include:
+
+::
+
+  AIX
+  BSDOS
+  BeOS
+  Cygwin
+  DOS
+  Darwin
+  FreeBSD
+  HP-UX
+  Haiku
+  IRIX
+  Linux
+  MP-RAS
+  MinGW
+  NetBSD
+  OS2
+  OSF1
+  OpenBSD
+  QNX
+  RISCos
+  SCO_SV
+  SINIX
+  SunOS
+  Tru64
+  ULTRIX
+  UNIX_SV
+  Windows
+  Windows3x
+  Xenix
+
+This variable is not guaranteed to be defined for all platforms.
+An empty string represents an unknown platform.
diff --git a/Modules/CMakePlatformId.h.in b/Modules/CMakePlatformId.h.in
index bc26c07..f182d46 100644
--- a/Modules/CMakePlatformId.h.in
+++ b/Modules/CMakePlatformId.h.in
@@ -1,4 +1,5 @@
-/* Identify known platforms by name.  */
+/* Identify known platforms by name. If you add a platform here, also
+   document it in "Help/variable/CMAKE_LANG_PLATFORM_ID.rst". */
 #if defined(__linux) || defined(__linux__) || defined(linux)
 # define PLATFORM_ID "Linux"
 

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

Summary of changes:
 Help/variable/CMAKE_LANG_PLATFORM_ID.rst |   38 ++++++++++++++++++++++++++++--
 Modules/CMakePlatformId.h.in             |    3 ++-
 2 files changed, 38 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake