diff options
| author | Brad King <brad.king@kitware.com> | 2011-01-26 20:25:18 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-01-26 20:25:18 (GMT) |
| commit | 833b8aa902f765601ea3209e39bbacf574a77432 (patch) | |
| tree | 407cfa750ab1cbc2b8bbdf68279831ddaaf7cbaa /Source/cmGlobalGenerator.h | |
| parent | 7f37eac6dd7f26c33b0c80b99f862ac0f53e6a8e (diff) | |
| parent | c83a834d29965e245e1e93fcda0e98e58e775f9f (diff) | |
| download | CMake-833b8aa902f765601ea3209e39bbacf574a77432.zip CMake-833b8aa902f765601ea3209e39bbacf574a77432.tar.gz CMake-833b8aa902f765601ea3209e39bbacf574a77432.tar.bz2 | |
Merge topic 'recursive-CMAKE_USER_MAKE_RULES_OVERRIDE'
c83a834 try_compile: Allow only languages loaded in caller (#11469)
Diffstat (limited to 'Source/cmGlobalGenerator.h')
| -rw-r--r-- | Source/cmGlobalGenerator.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h index 6a1aa53..5268731 100644 --- a/Source/cmGlobalGenerator.h +++ b/Source/cmGlobalGenerator.h @@ -79,7 +79,8 @@ public: /** * Try to determine system infomation, get it from another generator */ - virtual void EnableLanguagesFromGenerator(cmGlobalGenerator *gen); + virtual void EnableLanguagesFromGenerator(cmGlobalGenerator *gen, + cmMakefile* mf); /** * Try running cmake and building a file. This is used for dynalically @@ -325,11 +326,13 @@ protected: virtual bool UseFolderProperty(); private: + cmMakefile* TryCompileOuterMakefile; float FirstTimeProgress; // If you add a new map here, make sure it is copied // in EnableLanguagesFromGenerator std::map<cmStdString, bool> IgnoreExtensions; std::map<cmStdString, bool> LanguageEnabled; + std::set<cmStdString> LanguagesReady; // Ready for try_compile std::map<cmStdString, cmStdString> OutputExtensions; std::map<cmStdString, cmStdString> LanguageToOutputExtension; std::map<cmStdString, cmStdString> ExtensionToLanguage; |