[Cmake-commits] CMake branch, next, updated. v3.3.1-2356-g30053d2

Chuck Atkins chuck.atkins at kitware.com
Mon Aug 24 09:32:18 EDT 2015


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  30053d2113a57e86404da58bfb0e4e3d44c46743 (commit)
       via  1297f3dfb106803a002d8f0505bb5d54983c62cf (commit)
      from  a545cecbf50d59685021f45c51b6f34052b55f82 (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=30053d2113a57e86404da58bfb0e4e3d44c46743
commit 30053d2113a57e86404da58bfb0e4e3d44c46743
Merge: a545cec 1297f3d
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Mon Aug 24 09:32:18 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Aug 24 09:32:18 2015 -0400

    Merge topic 'add-shared-link-flags-to-try_compile' into next
    
    1297f3df help: Remove bad references to CMAKE_SHARED_LIBRARY_LINK_<LANG>_FLAGS


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1297f3dfb106803a002d8f0505bb5d54983c62cf
commit 1297f3dfb106803a002d8f0505bb5d54983c62cf
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Mon Aug 24 09:31:27 2015 -0400
Commit:     Chuck Atkins <chuck.atkins at kitware.com>
CommitDate: Mon Aug 24 09:31:27 2015 -0400

    help: Remove bad references to CMAKE_SHARED_LIBRARY_LINK_<LANG>_FLAGS

diff --git a/Help/command/try_compile.rst b/Help/command/try_compile.rst
index 3131bdc..a014b98 100644
--- a/Help/command/try_compile.rst
+++ b/Help/command/try_compile.rst
@@ -108,7 +108,7 @@ If :policy:`CMP0056` is set to ``NEW``, then
 :variable:`CMAKE_EXE_LINKER_FLAGS` is passed in.
 
 If :policy:`CMP0065` is set to ``NEW``, then
-:variable:`CMAKE_SHARED_LIBRARY_LINK_<LANG>_FLAGS` is also passed in.
+CMAKE_SHARED_LIBRARY_LINK_<LANG>_FLAGS is also passed in.
 
 Set the :variable:`CMAKE_TRY_COMPILE_CONFIGURATION` variable to choose
 a build configuration.
diff --git a/Help/policy/CMP0065.rst b/Help/policy/CMP0065.rst
index cbabd69..168b338 100644
--- a/Help/policy/CMP0065.rst
+++ b/Help/policy/CMP0065.rst
@@ -9,20 +9,19 @@ The :command:`try_compile` command source-file signature generates a
 In order to compile the source the same way as it might be compiled
 by the calling project, the generated project sets the value of the
 :variable:`CMAKE_<LANG>_FLAGS` variable to that in the calling project.
-The value of the :variable:`CMAKE_SHARED_LIBRARY_LINK_<LANG>_FLAGS`
-variable may be needed in some cases, when it's changed from the
-default settings in the Platform or Toolchain file, but CMake 3.3.1 and
-lower did not set it in the generated project.  CMake 3.3.2 and above
-prefer to set it so that the additional linker flags are honored as
-well as compiler flags.  This policy provides compatibility with the
-pre-3.3.2 behavior.
+The value of the CMAKE_SHARED_LIBRARY_LINK_<LANG>_FLAGS variable may be
+needed in some cases, when it's changed from the default settings in the
+Platform or Toolchain file, but CMake 3.3.1 and lower did not set it in
+the generated project.  CMake 3.3.2 and above prefer to set it so that
+the additional linker flags are honored as well as compiler flags.  This
+policy provides compatibility with the pre-3.3.2 behavior.
 
 The OLD behavior for this policy is to not set the value of the
-:variable:`CMAKE_SHARED_LIBRARY_LINK_<LANG>_FLAGS` variable in the
-generated test project and just rely on the values loaded from the
-Platform file.  The NEW behavior for this policy is to set the value of
-the :variable:`CMAKE_SHARED_LIBRARY_LINK_<LANG>_FLAGS` variable in the
-test project to the same as it is in the calling project.
+CMAKE_SHARED_LIBRARY_LINK_<LANG>_FLAGS variable in the generated test
+project and just rely on the values loaded from the Platform file.  The
+NEW behavior for this policy is to set the value of the
+CMAKE_SHARED_LIBRARY_LINK_<LANG>_FLAGS variable in the test project to
+the same as it is in the calling project.
 
 If the project code does not set the policy explicitly, users may
 set it on the command line by defining the

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

Summary of changes:
 Help/command/try_compile.rst |    2 +-
 Help/policy/CMP0065.rst      |   23 +++++++++++------------
 2 files changed, 12 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list