[Cmake-commits] CMake branch, next, updated. v3.3.0-rc4-1234-gf074efb

[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  f074efbf369210d7b61ec58ef48f3471b585fd95 (commit)
       via  baf485b35ef80ef2f0c58716de02bee0c2960f5c (commit)
      from  ddf60dae50a503c1fd7ea460dc13921e470cdc44 (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=f074efbf369210d7b61ec58ef48f3471b585fd95
commit f074efbf369210d7b61ec58ef48f3471b585fd95
Merge: ddf60da baf485b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 21 15:39:44 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 21 15:39:44 2015 -0400

    Merge topic 'vs-OBJECT_DEPENDS-vcxproj' into next
    
    baf485b3 VS: Implement OBJECT_DEPENDS for VS >= 10 .vcxproj files


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=baf485b35ef80ef2f0c58716de02bee0c2960f5c
commit baf485b35ef80ef2f0c58716de02bee0c2960f5c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 21 15:19:07 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jul 21 15:26:35 2015 -0400

    VS: Implement OBJECT_DEPENDS for VS >= 10 .vcxproj files
    
    The IDE does not appear to expose a way to add dependencies to
    compilation rules.  However, msbuild seems to support an
    AdditionalInputs element inside ClCompile elements.  Use this
    to implement the OBJECT_DEPENDS source file property.
    
    Reported-by: Allen Byrne <byrn at hdfgroup.org>

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 67d52b8..d9395e1 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1623,6 +1623,11 @@ bool cmVisualStudio10TargetGenerator::OutputSourceSpecificFlags(
     {
     defines += cdefs;
     }
+  std::vector<std::string> depends;
+  if (const char* deps = sf.GetProperty("OBJECT_DEPENDS"))
+    {
+    cmSystemTools::ExpandListArgument(deps, depends);
+    }
   std::string lang =
     this->GlobalGenerator->GetLanguageFromExtension
     (sf.GetExtension().c_str());
@@ -1683,7 +1688,8 @@ bool cmVisualStudio10TargetGenerator::OutputSourceSpecificFlags(
       }
     // if we have flags or defines for this config then
     // use them
-    if(!flags.empty() || !configDefines.empty() || compileAs || noWinRT)
+    if(!flags.empty() || !configDefines.empty() ||
+       compileAs || noWinRT || !depends.empty())
       {
       (*this->BuildFileStream ) << firstString;
       firstString = ""; // only do firstString once
@@ -1711,6 +1717,10 @@ bool cmVisualStudio10TargetGenerator::OutputSourceSpecificFlags(
         clOptions.AppendFlag("DisableSpecificWarnings",
                              "%(DisableSpecificWarnings)");
         }
+      if (!depends.empty())
+        {
+        clOptions.AddFlag("AdditionalInputs", depends);
+        }
       clOptions.AddDefines(configDefines.c_str());
       clOptions.SetConfiguration((*config).c_str());
       clOptions.OutputAdditionalOptions(*this->BuildFileStream, "      ", "");

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

Summary of changes:
 Source/cmVisualStudio10TargetGenerator.cxx |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake