diff options
| author | Brad King <brad.king@kitware.com> | 2015-06-30 14:23:31 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-06-30 14:23:31 (GMT) |
| commit | 7e3ac12df45fa42b590971accaf1db89b1a0ffb6 (patch) | |
| tree | 480940822cee039d85e629364ce62e9c777a1882 /Source | |
| parent | 5ff47ea93d490616292aae88847b42d56200d9e7 (diff) | |
| parent | 327490e698db7a74f6a8e8543e99c6c7c9333a8f (diff) | |
| download | CMake-7e3ac12df45fa42b590971accaf1db89b1a0ffb6.zip CMake-7e3ac12df45fa42b590971accaf1db89b1a0ffb6.tar.gz CMake-7e3ac12df45fa42b590971accaf1db89b1a0ffb6.tar.bz2 | |
Merge topic 'enable_language-fail-earlier'
327490e6 enable_language: Allow CMakeDetermine<LANG>Compiler module to fail early
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 14eaeac..23ab93d 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -564,6 +564,10 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages, cmSystemTools::Error("Could not find cmake module file: ", determineCompiler.c_str()); } + if (cmSystemTools::GetFatalErrorOccured()) + { + return; + } needTestLanguage[lang] = true; // Some generators like visual studio should not use the env variables // So the global generator can specify that in this variable |