[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-511-g61a3df1

[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  61a3df10dab68abd2a54070d38f998835ab0d719 (commit)
       via  4db31095e5f4ce410c013e0b92bc5d1baee03934 (commit)
      from  79d8534918d16221130115259c3afa51ff97323e (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=61a3df10dab68abd2a54070d38f998835ab0d719
commit 61a3df10dab68abd2a54070d38f998835ab0d719
Merge: 79d8534 4db3109
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 11 12:45:12 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 11 12:45:12 2014 -0500

    Merge topic 'fix_link-line-dedup_regression' into next
    
    4db31095 Fix link line order when shared libraries are de-duplicated


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4db31095e5f4ce410c013e0b92bc5d1baee03934
commit 4db31095e5f4ce410c013e0b92bc5d1baee03934
Author:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Sun Nov 9 17:35:20 2014 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 10 14:46:22 2014 -0500

    Fix link line order when shared libraries are de-duplicated
    
    Since commit v3.1.0-rc1~227^2~1 (De-duplicate shared library targets in
    generated link lines, 2014-07-30) we de-duplicate shared library targets
    on the link line.  However, some toolchains will fail linking if an
    executable is linking to a shared library that is not used directly and
    a static library that depends on the shared one.  The linker may not
    keep the reference to the shared library the first time and then the
    symbols needed by the static library may not be found.
    
    Fix this by reversing the direction of the for loop that removes the
    duplicate shared libraries, in order to ensure that the last occurrence
    of the library is left instead of the first one.
    
    Extend Tests/Dependency with a case covering this behavior.  Create an
    executable that links to a shared library and a static library but only
    needs the shared library as a dependency of the static library.
    
    Co-Author: Brad King <brad.king at kitware.com>

diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index b13a125..1fb8f30 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -263,21 +263,26 @@ cmComputeLinkDepends::Compute()
   this->OrderLinkEntires();
 
   // Compute the final set of link entries.
+  // Iterate in reverse order so we can keep only the last occurrence
+  // of a shared library.
   std::set<int> emmitted;
-  for(std::vector<int>::const_iterator li = this->FinalLinkOrder.begin();
-      li != this->FinalLinkOrder.end(); ++li)
+  for(std::vector<int>::const_reverse_iterator
+        li = this->FinalLinkOrder.rbegin(),
+        le = this->FinalLinkOrder.rend();
+      li != le; ++li)
     {
     int i = *li;
     LinkEntry const& e = this->EntryList[i];
     cmTarget const* t = e.Target;
-    // Entries that we know the linker will re-use for symbols
-    // needed by later entries do not need to be repeated.
+    // Entries that we know the linker will re-use do not need to be repeated.
     bool uniquify = t && t->GetType() == cmTarget::SHARED_LIBRARY;
     if(!uniquify || emmitted.insert(i).second)
       {
       this->FinalLinkEntries.push_back(e);
       }
     }
+  // Reverse the resulting order since we iterated in reverse.
+  std::reverse(this->FinalLinkEntries.begin(), this->FinalLinkEntries.end());
 
   // Display the final set.
   if(this->DebugMode)
diff --git a/Tests/Dependency/CMakeLists.txt b/Tests/Dependency/CMakeLists.txt
index ef42048..ebc2d10 100644
--- a/Tests/Dependency/CMakeLists.txt
+++ b/Tests/Dependency/CMakeLists.txt
@@ -51,3 +51,4 @@ add_subdirectory(Case1)
 add_subdirectory(Case2)
 add_subdirectory(Case3)
 add_subdirectory(Case4)
+add_subdirectory(Case5)
diff --git a/Tests/Dependency/Case5/CMakeLists.txt b/Tests/Dependency/Case5/CMakeLists.txt
new file mode 100644
index 0000000..e954b02
--- /dev/null
+++ b/Tests/Dependency/Case5/CMakeLists.txt
@@ -0,0 +1,8 @@
+project(CASE5 C)
+
+add_library(case5Foo SHARED foo.c)
+add_library(case5Bar STATIC bar.c)
+target_link_libraries(case5Bar case5Foo)
+
+add_executable(case5 main.c)
+target_link_libraries(case5 case5Foo case5Bar)
diff --git a/Tests/Dependency/Case5/bar.c b/Tests/Dependency/Case5/bar.c
new file mode 100644
index 0000000..4cb1b1b
--- /dev/null
+++ b/Tests/Dependency/Case5/bar.c
@@ -0,0 +1,12 @@
+#ifdef _WIN32
+__declspec(dllimport)
+#endif
+void foo(void);
+
+#include <stdio.h>
+
+void bar(void)
+{
+  foo();
+  printf("bar()\n");
+}
diff --git a/Tests/Dependency/Case5/foo.c b/Tests/Dependency/Case5/foo.c
new file mode 100644
index 0000000..794833d
--- /dev/null
+++ b/Tests/Dependency/Case5/foo.c
@@ -0,0 +1,9 @@
+#include <stdio.h>
+
+#ifdef _WIN32
+__declspec(dllexport)
+#endif
+void foo(void)
+{
+  printf("foo()\n");
+}
diff --git a/Tests/Dependency/Case5/main.c b/Tests/Dependency/Case5/main.c
new file mode 100644
index 0000000..ae3dc95
--- /dev/null
+++ b/Tests/Dependency/Case5/main.c
@@ -0,0 +1,7 @@
+void bar(void);
+
+int main(int argc, char *argv[])
+{
+  bar();
+  return 0;
+}

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

Summary of changes:


hooks/post-receive
-- 
CMake