BUG: enable the languages when not running in global mode
This commit is contained in:
parent
99f115d1fd
commit
bf70e0c246
@ -147,8 +147,7 @@ void cmGlobalGenerator::EnableLanguage(const char* lang,
|
|||||||
putenv(envCXX);
|
putenv(envCXX);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// check for a Java compiler and configure it
|
||||||
// check for a Java compiler and configure it
|
|
||||||
if(!isLocal &&
|
if(!isLocal &&
|
||||||
!this->GetLanguageEnabled("JAVA") &&
|
!this->GetLanguageEnabled("JAVA") &&
|
||||||
strcmp(lang, "JAVA") == 0)
|
strcmp(lang, "JAVA") == 0)
|
||||||
@ -171,18 +170,22 @@ void cmGlobalGenerator::EnableLanguage(const char* lang,
|
|||||||
fpath = rootBin;
|
fpath = rootBin;
|
||||||
fpath += "/CMakeCCompiler.cmake";
|
fpath += "/CMakeCCompiler.cmake";
|
||||||
mf->ReadListFile(0,fpath.c_str());
|
mf->ReadListFile(0,fpath.c_str());
|
||||||
|
this->SetLanguageEnabled("C");
|
||||||
}
|
}
|
||||||
if(strcmp(lang, "CXX") == 0 && !mf->GetDefinition("CMAKE_CXX_COMPILER_LOADED"))
|
if(strcmp(lang, "CXX") == 0 && !mf->GetDefinition("CMAKE_CXX_COMPILER_LOADED"))
|
||||||
{
|
{
|
||||||
fpath = rootBin;
|
fpath = rootBin;
|
||||||
fpath += "/CMakeCXXCompiler.cmake";
|
fpath += "/CMakeCXXCompiler.cmake";
|
||||||
mf->ReadListFile(0,fpath.c_str());
|
mf->ReadListFile(0,fpath.c_str());
|
||||||
|
this->SetLanguageEnabled("CXX");
|
||||||
|
|
||||||
}
|
}
|
||||||
if(strcmp(lang, "JAVA") == 0 && !mf->GetDefinition("CMAKE_JAVA_COMPILER_LOADED"))
|
if(strcmp(lang, "JAVA") == 0 && !mf->GetDefinition("CMAKE_JAVA_COMPILER_LOADED"))
|
||||||
{
|
{
|
||||||
fpath = rootBin;
|
fpath = rootBin;
|
||||||
fpath += "/CMakeJavaCompiler.cmake";
|
fpath += "/CMakeJavaCompiler.cmake";
|
||||||
mf->ReadListFile(0,fpath.c_str());
|
mf->ReadListFile(0,fpath.c_str());
|
||||||
|
this->SetLanguageEnabled("JAVA");
|
||||||
}
|
}
|
||||||
if ( lang[0] == 'C' && !mf->GetDefinition("CMAKE_SYSTEM_SPECIFIC_INFORMATION_LOADED"))
|
if ( lang[0] == 'C' && !mf->GetDefinition("CMAKE_SYSTEM_SPECIFIC_INFORMATION_LOADED"))
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user