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/cmMakefile.cxx | |
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/cmMakefile.cxx')
-rw-r--r-- | Source/cmMakefile.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index e1cea22..e443b86 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -2737,7 +2737,7 @@ int cmMakefile::TryCompile(const char *srcdir, const char *bindir, } // to save time we pass the EnableLanguage info directly gg->EnableLanguagesFromGenerator - (this->LocalGenerator->GetGlobalGenerator()); + (this->LocalGenerator->GetGlobalGenerator(), this); if(this->IsOn("CMAKE_SUPPRESS_DEVELOPER_WARNINGS")) { cm.AddCacheEntry("CMAKE_SUPPRESS_DEVELOPER_WARNINGS", |