[Cmake-commits] CMake branch, next, updated. v3.5.2-1536-g489d882

Brad King brad.king at kitware.com
Tue May 24 11:43:59 EDT 2016


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  489d882aa966193309a87b92294d206fbeb0b952 (commit)
       via  7807b3a9db35acd683fd82c6d902272991a9789a (commit)
       via  ecb4ad2aa2f5de4bbf4ef7c49d70c700f2c28b4e (commit)
      from  eec9b0f91dac9ac4dc938c624b44ac55b69b3c1c (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=489d882aa966193309a87b92294d206fbeb0b952
commit 489d882aa966193309a87b92294d206fbeb0b952
Merge: eec9b0f 7807b3a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 24 11:43:58 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 24 11:43:58 2016 -0400

    Merge topic 'doc-standard-libs' into next
    
    7807b3a9 Help: Document CMAKE_<LANG>_STANDARD_LIBRARIES variable
    ecb4ad2a CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7807b3a9db35acd683fd82c6d902272991a9789a
commit 7807b3a9db35acd683fd82c6d902272991a9789a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 24 09:58:48 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue May 24 11:40:25 2016 -0400

    Help: Document CMAKE_<LANG>_STANDARD_LIBRARIES variable
    
    Also drop documentation of non-existent CMAKE_STANDARD_LIBRARIES
    variable.

diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst
index ec741ae..925b70c 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -68,7 +68,6 @@ Variables that Provide Information
    /variable/CMAKE_SKIP_INSTALL_RULES
    /variable/CMAKE_SKIP_RPATH
    /variable/CMAKE_SOURCE_DIR
-   /variable/CMAKE_STANDARD_LIBRARIES
    /variable/CMAKE_STATIC_LIBRARY_PREFIX
    /variable/CMAKE_STATIC_LIBRARY_SUFFIX
    /variable/CMAKE_TOOLCHAIN_FILE
@@ -366,6 +365,7 @@ Variables for Languages
    /variable/CMAKE_LANG_SIMULATE_VERSION
    /variable/CMAKE_LANG_SIZEOF_DATA_PTR
    /variable/CMAKE_LANG_SOURCE_FILE_EXTENSIONS
+   /variable/CMAKE_LANG_STANDARD_LIBRARIES
    /variable/CMAKE_USER_MAKE_RULES_OVERRIDE_LANG
 
 Variables for CTest
diff --git a/Help/release/dev/doc-standard-libs.rst b/Help/release/dev/doc-standard-libs.rst
new file mode 100644
index 0000000..6a99037
--- /dev/null
+++ b/Help/release/dev/doc-standard-libs.rst
@@ -0,0 +1,6 @@
+doc-standard-libs
+-----------------
+
+* The :variable:`CMAKE_<LANG>_STANDARD_LIBRARIES` variable is now documented.
+  It is intended for use by toolchain files to specify system libraries to be
+  added to all linker command lines.
diff --git a/Help/variable/CMAKE_LANG_STANDARD_LIBRARIES.rst b/Help/variable/CMAKE_LANG_STANDARD_LIBRARIES.rst
new file mode 100644
index 0000000..ad3b911
--- /dev/null
+++ b/Help/variable/CMAKE_LANG_STANDARD_LIBRARIES.rst
@@ -0,0 +1,10 @@
+CMAKE_<LANG>_STANDARD_LIBRARIES
+-------------------------------
+
+Libraries linked into every executable and shared library linked
+for language ``<LANG>``.  This is meant for specification of system
+libraries needed by the language for the current platform.
+
+This variable should not be set by project code.  It is meant to be set by
+CMake's platform information modules for the current toolchain, or by a
+toolchain file when used with :variable:`CMAKE_TOOLCHAIN_FILE`.
diff --git a/Help/variable/CMAKE_STANDARD_LIBRARIES.rst b/Help/variable/CMAKE_STANDARD_LIBRARIES.rst
deleted file mode 100644
index 9c728cd..0000000
--- a/Help/variable/CMAKE_STANDARD_LIBRARIES.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-CMAKE_STANDARD_LIBRARIES
-------------------------
-
-Libraries linked into every executable and shared library.
-
-This is the list of libraries that are linked into all executables and
-libraries.

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

Summary of changes:
 Help/manual/cmake-variables.7.rst               |    2 +-
 Help/release/dev/doc-standard-libs.rst          |    6 ++++++
 Help/variable/CMAKE_LANG_STANDARD_LIBRARIES.rst |   10 ++++++++++
 Help/variable/CMAKE_STANDARD_LIBRARIES.rst      |    7 -------
 Source/CMakeVersion.cmake                       |    2 +-
 5 files changed, 18 insertions(+), 9 deletions(-)
 create mode 100644 Help/release/dev/doc-standard-libs.rst
 create mode 100644 Help/variable/CMAKE_LANG_STANDARD_LIBRARIES.rst
 delete mode 100644 Help/variable/CMAKE_STANDARD_LIBRARIES.rst


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list