[Cmake-commits] CMake branch, next, updated. v3.3.0-1992-g662af68

[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  662af68dd367056396d8c48f9854137ff05f45ba (commit)
       via  43c94281401cfa89bcbe7110727845ed5df984ec (commit)
      from  31677be7228d3890ec7d77757a55dbf70db76ad6 (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=662af68dd367056396d8c48f9854137ff05f45ba
commit 662af68dd367056396d8c48f9854137ff05f45ba
Merge: 31677be 43c9428
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 5 14:12:36 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 5 14:12:36 2015 -0400

    Merge topic 'ninja-LINK_DEPENDS' into next
    
    43c94281 Ninja: Honor the LINK_DEPENDS target property (#14796)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=43c94281401cfa89bcbe7110727845ed5df984ec
commit 43c94281401cfa89bcbe7110727845ed5df984ec
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 5 14:02:55 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Aug 5 14:12:05 2015 -0400

    Ninja: Honor the LINK_DEPENDS target property (#14796)

diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 4e4dc3f..08b2e66 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -209,6 +209,15 @@ cmNinjaDeps cmNinjaTargetGenerator::ComputeLinkDeps() const
     result.push_back(this->ConvertToNinjaPath(this->ModuleDefinitionFile));
     }
 
+  // Add user-specified dependencies.
+  if (const char* linkDepends = this->Target->GetProperty("LINK_DEPENDS"))
+    {
+    std::vector<std::string> linkDeps;
+    cmSystemTools::ExpandListArgument(linkDepends, linkDeps);
+    std::transform(linkDeps.begin(), linkDeps.end(),
+                   std::back_inserter(result), MapToNinjaPath());
+    }
+
   return result;
 }
 
diff --git a/Tests/BuildDepends/CMakeLists.txt b/Tests/BuildDepends/CMakeLists.txt
index 7b7353c..36987de 100644
--- a/Tests/BuildDepends/CMakeLists.txt
+++ b/Tests/BuildDepends/CMakeLists.txt
@@ -34,7 +34,7 @@ if(WIN32 AND "${CMAKE_CXX_COMPILER_ID}" MATCHES "Intel")
   set(_cmake_options "-DCMAKE_EXE_LINKER_FLAGS=")
 endif()
 
-if("${CMAKE_GENERATOR}" MATCHES "Make")
+if("${CMAKE_GENERATOR}" MATCHES "Make|Ninja")
   set(TEST_LINK_DEPENDS ${BuildDepends_BINARY_DIR}/Project/linkdep.txt)
   file(WRITE ${TEST_LINK_DEPENDS} "1")
 endif()

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

Summary of changes:
 Source/cmNinjaTargetGenerator.cxx |    9 +++++++++
 Tests/BuildDepends/CMakeLists.txt |    2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake