[Cmake-commits] CMake branch, next, updated. v2.8.11.2-2967-g3483903

[Stephen Kelly]

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  34839032c3671d6593ab6275006654eca868ac05 (commit)
       via  5540dd35f9ae57417e27095351afc2d5bc47db73 (commit)
      from  8f939bba4c08a48d5b8b93139e2ec7d86604b01e (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=34839032c3671d6593ab6275006654eca868ac05
commit 34839032c3671d6593ab6275006654eca868ac05
Merge: 8f939bb 5540dd3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jul 8 14:22:39 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 8 14:22:39 2013 -0400

    Merge topic 'INTERFACE_LINK_LIBRARIES-prop' into next
    
    5540dd3 Silence policy warning when link_libraries command is used.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5540dd35f9ae57417e27095351afc2d5bc47db73
commit 5540dd35f9ae57417e27095351afc2d5bc47db73
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jul 8 15:52:42 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Jul 8 20:20:48 2013 +0200

    Silence policy warning when link_libraries command is used.
    
    Because the INTERFACE_LINK_LIBRARIES property is now populated by
    the target_link_libraries when operating on a static library,
    make an equivalent change which populates the property with
    the same value when the old link_libraries() command is used.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index f08399f..1dbf665 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2321,6 +2321,14 @@ void cmTarget::MergeLinkLibraries( cmMakefile& mf,
     {
     // We call this so that the dependencies get written to the cache
     this->AddLinkLibrary( mf, selfname, i->first.c_str(), i->second );
+
+    if (this->GetType() == cmTarget::STATIC_LIBRARY)
+      {
+      this->AppendProperty("INTERFACE_LINK_LIBRARIES",
+            ("$<LINK_ONLY:" +
+            this->GetDebugGeneratorExpressions(i->first.c_str(), i->second) +
+            ">").c_str());
+      }
     }
   this->PrevLinkedLibraries = libs;
 }
diff --git a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-link_libraries-stderr.txt b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-link_libraries-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-link_libraries-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-link_libraries.cmake b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-link_libraries.cmake
new file mode 100644
index 0000000..42c4084
--- /dev/null
+++ b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-link_libraries.cmake
@@ -0,0 +1,9 @@
+
+enable_language(CXX)
+
+add_subdirectory(dep1)
+add_subdirectory(dep2)
+add_subdirectory(dep3)
+
+add_library(somelib empty.cpp)
+target_link_libraries(somelib dep3)
diff --git a/Tests/RunCMake/CMP0022/RunCMakeTest.cmake b/Tests/RunCMake/CMP0022/RunCMakeTest.cmake
index 6b014e3..dcef0f5 100644
--- a/Tests/RunCMake/CMP0022/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CMP0022/RunCMakeTest.cmake
@@ -4,5 +4,6 @@ run_cmake(CMP0022-WARN)
 run_cmake(CMP0022-WARN-tll)
 run_cmake(CMP0022-WARN-static)
 run_cmake(CMP0022-NOWARN-static)
+run_cmake(CMP0022-NOWARN-static-link_libraries)
 run_cmake(CMP0022-export)
 run_cmake(CMP0022-install-export)
diff --git a/Tests/RunCMake/CMP0022/dep1/CMakeLists.txt b/Tests/RunCMake/CMP0022/dep1/CMakeLists.txt
new file mode 100644
index 0000000..f0a8179
--- /dev/null
+++ b/Tests/RunCMake/CMP0022/dep1/CMakeLists.txt
@@ -0,0 +1,2 @@
+
+add_library(dep1 ../empty_vs6_1.cpp)
diff --git a/Tests/RunCMake/CMP0022/dep2/CMakeLists.txt b/Tests/RunCMake/CMP0022/dep2/CMakeLists.txt
new file mode 100644
index 0000000..4f90162
--- /dev/null
+++ b/Tests/RunCMake/CMP0022/dep2/CMakeLists.txt
@@ -0,0 +1,2 @@
+
+add_library(dep2 ../empty_vs6_2.cpp)
diff --git a/Tests/RunCMake/CMP0022/dep3/CMakeLists.txt b/Tests/RunCMake/CMP0022/dep3/CMakeLists.txt
new file mode 100644
index 0000000..e85cb54
--- /dev/null
+++ b/Tests/RunCMake/CMP0022/dep3/CMakeLists.txt
@@ -0,0 +1,5 @@
+
+link_libraries(dep1)
+
+add_library(dep3 ../empty_vs6_3.cpp)
+target_link_libraries(dep3 dep2)

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

Summary of changes:
 Source/cmTarget.cxx                                |    8 ++++++++
 ...MP0022-NOWARN-static-link_libraries-stderr.txt} |    0
 .../CMP0022-NOWARN-static-link_libraries.cmake     |    9 +++++++++
 Tests/RunCMake/CMP0022/RunCMakeTest.cmake          |    1 +
 Tests/RunCMake/CMP0022/dep1/CMakeLists.txt         |    2 ++
 Tests/RunCMake/CMP0022/dep2/CMakeLists.txt         |    2 ++
 Tests/RunCMake/CMP0022/dep3/CMakeLists.txt         |    5 +++++
 7 files changed, 27 insertions(+), 0 deletions(-)
 copy Tests/RunCMake/CMP0022/{CMP0022-NOWARN-static-stderr.txt => CMP0022-NOWARN-static-link_libraries-stderr.txt} (100%)
 create mode 100644 Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-link_libraries.cmake
 create mode 100644 Tests/RunCMake/CMP0022/dep1/CMakeLists.txt
 create mode 100644 Tests/RunCMake/CMP0022/dep2/CMakeLists.txt
 create mode 100644 Tests/RunCMake/CMP0022/dep3/CMakeLists.txt


hooks/post-receive
-- 
CMake