summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalGenerator.h
diff options
context:
space:
mode:
authorAlexander Neundorf <neundorf@kde.org>2007-07-12 12:37:10 (GMT)
committerAlexander Neundorf <neundorf@kde.org>2007-07-12 12:37:10 (GMT)
commit021ceea1b0c841852f8ca3f9f550d966834b4d40 (patch)
tree3b9ea1abca5af7acf346531775369b4fb2aa8176 /Source/cmGlobalGenerator.h
parent16705a3e87f3f8a877b5fe8dc1e953c7abca4da3 (diff)
downloadCMake-021ceea1b0c841852f8ca3f9f550d966834b4d40.zip
CMake-021ceea1b0c841852f8ca3f9f550d966834b4d40.tar.gz
CMake-021ceea1b0c841852f8ca3f9f550d966834b4d40.tar.bz2
ENH: second try for handling the linker language with integer priority values (returning a pointer to a string on the stack is no good idea)
Alex
Diffstat (limited to 'Source/cmGlobalGenerator.h')
-rw-r--r--Source/cmGlobalGenerator.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 959945c..ccf00d7 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -153,7 +153,7 @@ public:
///! is an extension to be ignored
bool IgnoreFile(const char* ext);
///! What is the preference for linkers and this language (None or Prefered)
- const char* GetLinkerPreference(const char* lang);
+ int GetLinkerPreference(const char* lang);
///! What is the object file extension for a given source file?
const char* GetLanguageOutputExtension(cmSourceFile const&);
@@ -257,7 +257,7 @@ private:
std::map<cmStdString, cmStdString> OutputExtensions;
std::map<cmStdString, cmStdString> LanguageToOutputExtension;
std::map<cmStdString, cmStdString> ExtensionToLanguage;
- std::map<cmStdString, cmStdString> LanguageToLinkerPreference;
+ std::map<cmStdString, int> LanguageToLinkerPreference;
// this is used to improve performance
std::map<cmStdString,cmTarget *> TotalTargets;