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

BUG: enable the languages when not running in global mode

Browse Source
This commit is contained in:
Bill Hoffman 2002-12-19 15:34:11 -05:00
parent 99f115d1fd
commit bf70e0c246
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/cmGlobalGenerator.cxx
View File

@ -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"))
{ {