summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalGenerator.h
diff options
context:
space:
mode:
authorAlexander Neundorf <neundorf@kde.org>2007-07-11 21:29:27 (GMT)
committerAlexander Neundorf <neundorf@kde.org>2007-07-11 21:29:27 (GMT)
commit16705a3e87f3f8a877b5fe8dc1e953c7abca4da3 (patch)
treeb0d172432a933f384da65b00d0ff031ff2f39b41 /Source/cmGlobalGenerator.h
parentbea1a5de771832463299146b4f2e4317c37f30bc (diff)
downloadCMake-16705a3e87f3f8a877b5fe8dc1e953c7abca4da3.zip
CMake-16705a3e87f3f8a877b5fe8dc1e953c7abca4da3.tar.gz
CMake-16705a3e87f3f8a877b5fe8dc1e953c7abca4da3.tar.bz2
COMP: revert last commit for now, broke Visual Studio
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 ccf00d7..959945c 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)
- int GetLinkerPreference(const char* lang);
+ const char* 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, int> LanguageToLinkerPreference;
+ std::map<cmStdString, cmStdString> LanguageToLinkerPreference;
// this is used to improve performance
std::map<cmStdString,cmTarget *> TotalTargets;