[Cmake-commits] CMake branch, next, updated. v3.0.0-4200-g3904f16

[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  3904f162d52c8a146f05be144149078e2a7458b5 (commit)
       via  cb6551ea9ae1f2e2c109ff63e26d6986186616e3 (commit)
      from  6d8091e3c6f7889fc66cca65c863784a5ae1f2c2 (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=3904f162d52c8a146f05be144149078e2a7458b5
commit 3904f162d52c8a146f05be144149078e2a7458b5
Merge: 6d8091e cb6551e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 14 09:28:54 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 14 09:28:54 2014 -0400

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cb6551ea9ae1f2e2c109ff63e26d6986186616e3
commit cb6551ea9ae1f2e2c109ff63e26d6986186616e3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 14 09:29:36 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jul 14 09:29:36 2014 -0400

    Revert "Help: Document possible values of CMAKE_<LANG>_PLATFORM_ID (#15012)"
    
    This reverts commit d2f68588caba8f9df5756fc5c52d6e54d2caa6a5.
    This variable is still supposed to be internal.  CMAKE_SYSTEM_NAME
    is the public one.

diff --git a/Help/variable/CMAKE_LANG_PLATFORM_ID.rst b/Help/variable/CMAKE_LANG_PLATFORM_ID.rst
index f50e480..1b243e3 100644
--- a/Help/variable/CMAKE_LANG_PLATFORM_ID.rst
+++ b/Help/variable/CMAKE_LANG_PLATFORM_ID.rst
@@ -1,40 +1,6 @@
 CMAKE_<LANG>_PLATFORM_ID
 ------------------------
 
-Platform identification string.
+An internal variable 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.
+This is used in determining the platform and is subject to change.
diff --git a/Modules/CMakePlatformId.h.in b/Modules/CMakePlatformId.h.in
index f182d46..bc26c07 100644
--- a/Modules/CMakePlatformId.h.in
+++ b/Modules/CMakePlatformId.h.in
@@ -1,5 +1,4 @@
-/* Identify known platforms by name. If you add a platform here, also
-   document it in "Help/variable/CMAKE_LANG_PLATFORM_ID.rst". */
+/* Identify known platforms by name.  */
 #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, 3 insertions(+), 38 deletions(-)


hooks/post-receive
-- 
CMake