diff options
| author | Stephen Kelly <steveire@gmail.com> | 2014-03-19 08:11:11 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2014-03-31 21:18:44 (GMT) |
| commit | 857d30b52ef2fb011bad16249d34972fadae9b70 (patch) | |
| tree | a064f102b783cd6bbd913a4727efedc9e0d8fe11 /Source | |
| parent | 28e1d2f8fc08516e8fc3a009777437d3e086b8e6 (diff) | |
| download | CMake-857d30b52ef2fb011bad16249d34972fadae9b70.zip CMake-857d30b52ef2fb011bad16249d34972fadae9b70.tar.gz CMake-857d30b52ef2fb011bad16249d34972fadae9b70.tar.bz2 | |
cmGlobalGenerator: Add interface to call ForceLinkerLanguages
Avoid calling it too early when cmGeneratorTarget instances don't
yet exist.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 7 | ||||
| -rw-r--r-- | Source/cmGlobalGenerator.h | 2 | ||||
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 1 |
3 files changed, 9 insertions, 1 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 07637b3..2f3c6c9 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 49a418d..668bb6b 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 96b23d2..fdf73d6 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()) { |