[Cmake-commits] CMake branch, next, updated. v3.3.0-2202-g132099e

[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  132099ec2612bee91c6202f831f6164dd78a437b (commit)
       via  9b449e9c5d79465a807c052c6707e83a1df9efbc (commit)
      from  dbbcde63a4027122f1456969040132263a75ddf4 (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=132099ec2612bee91c6202f831f6164dd78a437b
commit 132099ec2612bee91c6202f831f6164dd78a437b
Merge: dbbcde6 9b449e9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 13 10:25:39 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 13 10:25:39 2015 -0400

    Merge topic 'use-generator-target' into next
    
    9b449e9c cmComputeLinkInformation: Lookup a target only if we have one


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9b449e9c5d79465a807c052c6707e83a1df9efbc
commit 9b449e9c5d79465a807c052c6707e83a1df9efbc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 13 09:56:54 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Aug 13 10:24:10 2015 -0400

    cmComputeLinkInformation: Lookup a target only if we have one
    
    The change in commit 27252b24 (cmComputeLinkInformation: Simplify
    generator object access, 2015-08-02) broke the conditional use of a
    target introduced in commit 41abdc17 (cmGeneratorTarget: Move GetSOName
    from cmTarget, 2015-08-04).  Restore the conditional lookup.  Add a test
    case that hacks platform information variables to trigger this code
    everywhere.

diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index c16472e..32f5d68 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -760,7 +760,7 @@ void cmComputeLinkInformation::AddSharedDepItem(std::string const& item,
     return;
     }
 
-  cmGeneratorTarget *gtgt = this->GlobalGenerator->GetGeneratorTarget(tgt);
+  cmGeneratorTarget *gtgt = 0;
 
   // Get a full path to the dependent shared library.
   // Add it to the runtime path computation so that the target being
diff --git a/Tests/RunCMake/target_link_libraries/RunCMakeTest.cmake b/Tests/RunCMake/target_link_libraries/RunCMakeTest.cmake
index 533c6a1..8307607 100644
--- a/Tests/RunCMake/target_link_libraries/RunCMakeTest.cmake
+++ b/Tests/RunCMake/target_link_libraries/RunCMakeTest.cmake
@@ -7,3 +7,4 @@ run_cmake(CMP0023-NEW-2)
 run_cmake(MixedSignature)
 run_cmake(Separate-PRIVATE-LINK_PRIVATE-uses)
 run_cmake(SubDirTarget)
+run_cmake(SharedDepNotTarget)
diff --git a/Tests/RunCMake/target_link_libraries/SharedDepNotTarget.cmake b/Tests/RunCMake/target_link_libraries/SharedDepNotTarget.cmake
new file mode 100644
index 0000000..bab537e
--- /dev/null
+++ b/Tests/RunCMake/target_link_libraries/SharedDepNotTarget.cmake
@@ -0,0 +1,10 @@
+enable_language(C)
+set(CMAKE_LINK_DEPENDENT_LIBRARY_DIRS 1)
+set(CMAKE_SHARED_LIBRARY_SUFFIX ".so")
+add_library(imported SHARED IMPORTED)
+set_target_properties(imported PROPERTIES
+  IMPORTED_LOCATION "imported"
+  IMPORTED_LINK_DEPENDENT_LIBRARIES "/path/to/libSharedDep.so"
+  )
+add_executable(empty empty.c)
+target_link_libraries(empty imported)

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

Summary of changes:
 Source/cmComputeLinkInformation.cxx                          |    2 +-
 Tests/RunCMake/target_link_libraries/RunCMakeTest.cmake      |    1 +
 .../RunCMake/target_link_libraries/SharedDepNotTarget.cmake  |   10 ++++++++++
 3 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 Tests/RunCMake/target_link_libraries/SharedDepNotTarget.cmake


hooks/post-receive
-- 
CMake