[Cmake-commits] CMake branch, next, updated. v3.0.0-rc2-1180-g3abe887

[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  3abe887fabe0c6c691bade07fbfad1706da506a3 (commit)
       via  e6ab38d2a11db70d0fdd959179a6294bb293968d (commit)
       via  14d0be3af6b996e5ee028d86e4e734fd0d3e5adc (commit)
      from  e9bd1349cfe464e1d009307b69a38e4b595de8df (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=3abe887fabe0c6c691bade07fbfad1706da506a3
commit 3abe887fabe0c6c691bade07fbfad1706da506a3
Merge: e9bd134 e6ab38d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Mar 19 04:12:23 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Mar 19 04:12:23 2014 -0400

    Merge topic 'target-sources-refactor' into next
    
    e6ab38d2 Make sure the source file is created.
    14d0be3a Fix Xcode.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e6ab38d2a11db70d0fdd959179a6294bb293968d
commit e6ab38d2a11db70d0fdd959179a6294bb293968d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Mar 19 09:11:38 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Mar 19 09:11:38 2014 +0100

    Make sure the source file is created.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 41846f3..9756ce6 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -590,7 +590,7 @@ void cmTarget::GetSourceFiles(std::vector<cmSourceFile*> &files) const
   for(std::vector<std::string>::const_iterator i = srcs.begin();
       i != srcs.end(); ++i)
     {
-    cmSourceFile* sf = this->Makefile->GetSource(*i);
+    cmSourceFile* sf = this->Makefile->GetOrCreateSource(*i);
     if (emitted.insert(sf).second)
       {
       files.push_back(sf);

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=14d0be3af6b996e5ee028d86e4e734fd0d3e5adc
commit 14d0be3af6b996e5ee028d86e4e734fd0d3e5adc
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Mar 19 09:11:11 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Mar 19 09:11:20 2014 +0100

    Fix Xcode.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 4765521..66ccf39 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -216,6 +216,11 @@ bool cmGlobalGenerator::GenerateImportFile(const std::string &file)
   return false;
 }
 
+void cmGlobalGenerator::ForceLinkerLanguages()
+{
+
+}
+
 bool
 cmGlobalGenerator::IsExportedTargetsFile(const std::string &filename) const
 {
@@ -1194,6 +1199,8 @@ void cmGlobalGenerator::Generate()
   // Create per-target generator information.
   this->CreateGeneratorTargets();
 
+  this->ForceLinkerLanguages();
+
 #ifdef CMAKE_BUILD_WITH_CMAKE
   for (AutogensType::iterator it = autogens.begin(); it != autogens.end();
        ++it)
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 2a82430..54f5f3b 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -423,6 +423,8 @@ private:
   void WriteSummary(cmTarget* target);
   void FinalizeTargetCompileInfo();
 
+  virtual void ForceLinkerLanguages();
+
   virtual void PrintCompilerAdvice(std::ostream& os, std::string const& lang,
                                    const char* envVar) const;
   void CheckCompilerIdCompatibility(cmMakefile* mf,
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index ddeab3b..c71cb81 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -343,7 +343,6 @@ void cmGlobalXCodeGenerator::Generate()
     // add ALL_BUILD, INSTALL, etc
     this->AddExtraTargets(root, it->second);
     }
-  this->ForceLinkerLanguages();
   this->cmGlobalGenerator::Generate();
   if(cmSystemTools::GetErrorOccuredFlag())
     {

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

Summary of changes:
 Source/cmGlobalGenerator.cxx      |    7 +++++++
 Source/cmGlobalGenerator.h        |    2 ++
 Source/cmGlobalXCodeGenerator.cxx |    1 -
 Source/cmTarget.cxx               |    2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake