summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalGenerator.h
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2009-07-10 20:51:44 (GMT)
committerBrad King <brad.king@kitware.com>2009-07-10 20:51:44 (GMT)
commita232dbe8d23729e4aeeb3e27fe0a807903e82a62 (patch)
treecb0e83679ce19a02b87c5b1a4e2857cb9206cde4 /Source/cmGlobalGenerator.h
parentbb2228ea1a2596c7068620a094e2ded3b4e5c8df (diff)
downloadCMake-a232dbe8d23729e4aeeb3e27fe0a807903e82a62.zip
CMake-a232dbe8d23729e4aeeb3e27fe0a807903e82a62.tar.gz
CMake-a232dbe8d23729e4aeeb3e27fe0a807903e82a62.tar.bz2
BUG: Fix Xcode linker language
Xcode does not seem to support direct requests for using the linker for a particular language. It always infers the linker using the languages in the source files. When no user source files compile with target's linker language we add one to help Xcode pick the linker. A typical use case is when a C executable links to a C++ archive. The executable has no C++ source files but we need to use the C++ linker.
Diffstat (limited to 'Source/cmGlobalGenerator.h')
-rw-r--r--Source/cmGlobalGenerator.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 0eb27e4..4df2d39 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -317,6 +317,9 @@ protected:
// This is computed just before local generators generate.
cmTargetManifest TargetManifest;
+ // All targets in the entire project.
+ std::map<cmStdString,cmTarget *> TotalTargets;
+
private:
float FirstTimeProgress;
// If you add a new map here, make sure it is copied
@@ -328,9 +331,6 @@ private:
std::map<cmStdString, cmStdString> ExtensionToLanguage;
std::map<cmStdString, int> LanguageToLinkerPreference;
- // this is used to improve performance
- std::map<cmStdString,cmTarget *> TotalTargets;
-
// Record hashes for rules and outputs.
struct RuleHash { char Data[32]; };
std::map<cmStdString, RuleHash> RuleHashes;