[Cmake-commits] CMake branch, next, updated. v3.3.2-3402-ga00cb0c

[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  a00cb0cbeea37a2d896275dfef76060481822da7 (commit)
       via  c5b521e2b99e8b8025990588f77d15340ab743b2 (commit)
      from  25e051b55896f9ba705ad58efa7f79abc64fa250 (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=a00cb0cbeea37a2d896275dfef76060481822da7
commit a00cb0cbeea37a2d896275dfef76060481822da7
Merge: 25e051b c5b521e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 30 11:01:32 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 30 11:01:32 2015 -0400

    Merge topic 'restrict-shlib-link-flags-to-enable-exports' into next
    
    c5b521e2 Drop executable symbol export if platform does not support shared libs


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c5b521e2b99e8b8025990588f77d15340ab743b2
commit c5b521e2b99e8b8025990588f77d15340ab743b2
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Tue Sep 29 11:34:18 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 30 10:59:58 2015 -0400

    Drop executable symbol export if platform does not support shared libs
    
    Instead of always adding CMAKE_SHARED_LIBRARY_LINK_<LANG>_FLAGS to
    executables, or just when the ENABLE_EXPORTS property is set (CMP0065),
    make sure that the target platform also actually supports shared
    libraries.  If not, then the executable cannot possibly provide symbols
    to them anyway.

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 6c7b194..71f36c4 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1540,7 +1540,9 @@ void cmLocalGenerator::OutputLinkLibraries(std::string& linkLibraries,
     this->Makefile->GetSafeDefinition("CMAKE_LIBRARY_PATH_TERMINATOR");
 
   // Flags to link an executable to shared libraries.
-  if( tgt.GetType() == cmTarget::EXECUTABLE )
+  if (tgt.GetType() == cmTarget::EXECUTABLE &&
+      this->StateSnapshot.GetState()->
+        GetGlobalPropertyAsBool("TARGET_SUPPORTS_SHARED_LIBS"))
     {
     bool add_shlib_flags = false;
     switch(tgt.Target->GetPolicyStatusCMP0065())

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

Summary of changes:
 Source/cmLocalGenerator.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake