diff options
| author | Brad King <brad.king@kitware.com> | 2014-09-24 13:21:44 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-09-24 13:21:44 (GMT) |
| commit | be5215c4ba85942a22143894048a4f160b65a87a (patch) | |
| tree | 04ae1ba26bdb177bcf68db8fc1fbf4d5d38563ff | |
| parent | 6bd776eba6221d9ef68b63d1c17a988145f31fc1 (diff) | |
| parent | 6120fca8e229da08fae1d58017962491fb6e03f3 (diff) | |
| download | CMake-be5215c4ba85942a22143894048a4f160b65a87a.zip CMake-be5215c4ba85942a22143894048a4f160b65a87a.tar.gz CMake-be5215c4ba85942a22143894048a4f160b65a87a.tar.bz2 | |
Merge topic 'ninja-compiler-change'
6120fca8 Ninja: Prevent compilers to be silently modified
| -rw-r--r-- | Source/cmGlobalNinjaGenerator.cxx | 9 | ||||
| -rw-r--r-- | Tests/RunCMake/CMakeLists.txt | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index 09ee128..50e1abb 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -540,6 +540,15 @@ void cmGlobalNinjaGenerator cmSystemTools::Error("The Ninja generator does not support Fortran yet."); } this->cmGlobalGenerator::EnableLanguage(langs, makefile, optional); + for(std::vector<std::string>::const_iterator l = langs.begin(); + l != langs.end(); ++l) + { + if(*l == "NONE") + { + continue; + } + this->ResolveLanguageCompiler(*l, makefile, optional); + } } bool cmGlobalNinjaGenerator::UsingMinGW = false; diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index 549aed8..fd3bb03 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -50,7 +50,7 @@ add_RunCMake_test(CMP0051) add_RunCMake_test(CMP0053) add_RunCMake_test(CMP0054) add_RunCMake_test(CTest) -if(UNIX AND "${CMAKE_GENERATOR}" MATCHES "Unix Makefiles") +if(UNIX AND "${CMAKE_GENERATOR}" MATCHES "Unix Makefiles|Ninja") add_RunCMake_test(CompilerChange) endif() add_RunCMake_test(CompilerNotFound) |