[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-1686-g75c460d

[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  75c460d078bbe959a3f0694cab7a298caabfe466 (commit)
       via  647c81d460fe615e454b665933b0ab9db388d5e7 (commit)
       via  ddf696ab9d7190e5582b0a1936cdb7027dc5e3a1 (commit)
      from  a4e1a75add70f5939e9319eec5211e912b488e76 (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=75c460d078bbe959a3f0694cab7a298caabfe466
commit 75c460d078bbe959a3f0694cab7a298caabfe466
Merge: a4e1a75 647c81d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Apr 1 06:35:43 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Apr 1 06:35:43 2014 -0400

    Merge topic 'target-transitive-sources' into next
    
    647c81d4 Fix VS6.
    ddf696ab Return full paths to files.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=647c81d460fe615e454b665933b0ab9db388d5e7
commit 647c81d460fe615e454b665933b0ab9db388d5e7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Apr 1 12:35:05 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Apr 1 12:35:05 2014 +0200

    Fix VS6.

diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index 6a39e28..5db735f 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -1272,7 +1272,20 @@ void cmLocalVisualStudio6Generator
   if(targetBuilds)
     {
     // Get the language to use for linking.
-    const std::string& linkLanguage = target.GetLinkerLanguage();
+    std::vector<std::string> configs;
+    target.GetMakefile()->GetConfigurations(configs);
+    std::vector<std::string>::const_iterator it = configs.begin();
+    const std::string& linkLanguage = target.GetLinkerLanguage(*it);
+    for ( ; it != configs.end(); ++it)
+      {
+      const std::string& configLinkLanguage = target.GetLinkerLanguage(*it);
+      if (configLinkLanguage != linkLanguage)
+        {
+        cmSystemTools::Error
+          ("Linker language must not vary by configuration for target: ",
+          target.GetName().c_str());
+        }
+      }
     if(linkLanguage.empty())
       {
       cmSystemTools::Error
@@ -1694,7 +1707,20 @@ void cmLocalVisualStudio6Generator
     if(target.GetType() >= cmTarget::EXECUTABLE &&
        target.GetType() <= cmTarget::OBJECT_LIBRARY)
       {
-      const std::string& linkLanguage = target.GetLinkerLanguage();
+      std::vector<std::string> configs;
+      target.GetMakefile()->GetConfigurations(configs);
+      std::vector<std::string>::const_iterator it = configs.begin();
+      const std::string& linkLanguage = target.GetLinkerLanguage(*it);
+      for ( ; it != configs.end(); ++it)
+        {
+        const std::string& configLinkLanguage = target.GetLinkerLanguage(*it);
+        if (configLinkLanguage != linkLanguage)
+          {
+          cmSystemTools::Error
+            ("Linker language must not vary by configuration for target: ",
+            target.GetName().c_str());
+          }
+        }
       if(linkLanguage.empty())
         {
         cmSystemTools::Error

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ddf696ab9d7190e5582b0a1936cdb7027dc5e3a1
commit ddf696ab9d7190e5582b0a1936cdb7027dc5e3a1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Apr 1 12:32:37 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Apr 1 12:32:37 2014 +0200

    Return full paths to files.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index dfd5796..475bcdb 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -578,14 +578,15 @@ static void processSources(cmTarget const* tgt,
         cacheSources = true;
         }
 
-      for(std::vector<std::string>::const_iterator i = entrySources.begin();
+      for(std::vector<std::string>::iterator i = entrySources.begin();
           i != entrySources.end(); ++i)
         {
-        std::string src = *i;
+        std::string& src = *i;
 
         cmSourceFile* sf = mf->GetOrCreateSource(src);
         std::string e;
-        if(sf->GetFullPath(&e).empty())
+        src = sf->GetFullPath(&e);
+        if(src.empty())
           {
           if(!e.empty())
             {

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

Summary of changes:
 Source/cmLocalVisualStudio6Generator.cxx |   30 ++++++++++++++++++++++++++++--
 Source/cmTarget.cxx                      |    7 ++++---
 2 files changed, 32 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake