mirror of
https://github.com/reactos/CMake.git
synced 2024-12-05 18:27:23 +00:00
Merge topic 'ninja-compiler-change'
6120fca8
Ninja: Prevent compilers to be silently modified
This commit is contained in:
commit
be5215c4ba
@ -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;
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user