kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'ninja-compiler-change' 

6120fca8 Ninja: Prevent compilers to be silently modified
This commit is contained in:
Brad King 2014-09-24 09:21:44 -04:00 committed by CMake Topic Stage
parent 6bd776eba6 6120fca8e2
commit be5215c4ba
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/cmGlobalNinjaGenerator.cxx
View File

@ -540,6 +540,15 @@ void cmGlobalNinjaGenerator
cmSystemTools::Error("The Ninja generator does not support Fortran yet."); cmSystemTools::Error("The Ninja generator does not support Fortran yet.");
} }
this->cmGlobalGenerator::EnableLanguage(langs, makefile, optional); 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; bool cmGlobalNinjaGenerator::UsingMinGW = false;

2
Tests/RunCMake/CMakeLists.txt
View File

@ -50,7 +50,7 @@ add_RunCMake_test(CMP0051)
add_RunCMake_test(CMP0053) add_RunCMake_test(CMP0053)
add_RunCMake_test(CMP0054) add_RunCMake_test(CMP0054)
add_RunCMake_test(CTest) 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) add_RunCMake_test(CompilerChange)
endif() endif()
add_RunCMake_test(CompilerNotFound) add_RunCMake_test(CompilerNotFound)