[Cmake-commits] CMake branch, next, updated. v3.6.0-rc4-630-g0af6999

Brad King brad.king at kitware.com
Thu Jun 30 09:06:51 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  0af69996b1944f385633bcfa3a2416bafc005873 (commit)
       via  c05d240ef7b4705e6a03d29a432412672193c11c (commit)
       via  dab3ccf29422105fe9d200bfecb6beccdb659190 (commit)
      from  7eff8e758d971032110a02cd1c550ff4bf0b4671 (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=0af69996b1944f385633bcfa3a2416bafc005873
commit 0af69996b1944f385633bcfa3a2416bafc005873
Merge: 7eff8e7 c05d240
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 30 09:06:50 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 30 09:06:50 2016 -0400

    Merge topic 'doc-updates' into next
    
    c05d240e Help: Document CMAKE_TRY_COMPILE_PLATFORM_VARIABLES example
    dab3ccf2 InstallRequiredSystemLibraries: Document UCRT option use case


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c05d240ef7b4705e6a03d29a432412672193c11c
commit c05d240ef7b4705e6a03d29a432412672193c11c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 30 09:03:41 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jun 30 09:03:41 2016 -0400

    Help: Document CMAKE_TRY_COMPILE_PLATFORM_VARIABLES example
    
    Suggested-by: Hendrik Sattler <post at hendrik-sattler.de>

diff --git a/Help/variable/CMAKE_TRY_COMPILE_PLATFORM_VARIABLES.rst b/Help/variable/CMAKE_TRY_COMPILE_PLATFORM_VARIABLES.rst
index 8e43465..0f96787 100644
--- a/Help/variable/CMAKE_TRY_COMPILE_PLATFORM_VARIABLES.rst
+++ b/Help/variable/CMAKE_TRY_COMPILE_PLATFORM_VARIABLES.rst
@@ -8,3 +8,19 @@ the host project.
 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`.
+
+Variables meaningful to CMake, such as :variable:`CMAKE_<LANG>_FLAGS`, are
+propagated automatically.  The ``CMAKE_TRY_COMPILE_PLATFORM_VARIABLES``
+variable may be set to pass custom variables meaningful to a toolchain file.
+For example, a toolchain file may contain:
+
+.. code-block:: cmake
+
+  set(CMAKE_SYSTEM_NAME ...)
+  set(CMAKE_TRY_COMPILE_PLATFORM_VARIABLES MY_CUSTOM_VARIABLE)
+  # ... use MY_CUSTOM_VARIABLE ...
+
+If a user passes ``-DMY_CUSTOM_VARIABLE=SomeValue`` to CMake then this
+setting will be made visible to the toolchain file both for the main
+project and for test projects generated by the :command:`try_compile`
+command source file signature.

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dab3ccf29422105fe9d200bfecb6beccdb659190
commit dab3ccf29422105fe9d200bfecb6beccdb659190
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 30 08:52:36 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jun 30 08:54:46 2016 -0400

    InstallRequiredSystemLibraries: Document UCRT option use case
    
    Suggested-by: Hendrik Sattler <post at hendrik-sattler.de>

diff --git a/Modules/InstallRequiredSystemLibraries.cmake b/Modules/InstallRequiredSystemLibraries.cmake
index aa84077..1c6e751 100644
--- a/Modules/InstallRequiredSystemLibraries.cmake
+++ b/Modules/InstallRequiredSystemLibraries.cmake
@@ -25,8 +25,8 @@
 #
 # ``CMAKE_INSTALL_UCRT_LIBRARIES``
 #   Set to TRUE to install the Windows Universal CRT libraries for
-#   app-local deployment.  This is meaningful only with MSVC from
-#   Visual Studio 2015 or higher.
+#   app-local deployment (e.g. to Windows XP).  This is meaningful
+#   only with MSVC from Visual Studio 2015 or higher.
 #
 # ``CMAKE_INSTALL_MFC_LIBRARIES``
 #   Set to TRUE to install the MSVC MFC runtime libraries.

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

Summary of changes:
 Help/variable/CMAKE_TRY_COMPILE_PLATFORM_VARIABLES.rst |   16 ++++++++++++++++
 Modules/InstallRequiredSystemLibraries.cmake           |    4 ++--
 2 files changed, 18 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list