diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2002-12-19 20:34:11 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2002-12-19 20:34:11 (GMT) |
| commit | bf70e0c2465722e861f94f695aa8e9565a7d7080 (patch) | |
| tree | ab5ee9e60d9a4aa64c68735bc34dba71df03b382 | |
| parent | 99f115d1fdf32baa7892e750e173aafdb435138f (diff) | |
| download | CMake-bf70e0c2465722e861f94f695aa8e9565a7d7080.zip CMake-bf70e0c2465722e861f94f695aa8e9565a7d7080.tar.gz CMake-bf70e0c2465722e861f94f695aa8e9565a7d7080.tar.bz2 | |
BUG: enable the languages when not running in global mode
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index e0edfed..7830662 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -147,8 +147,7 @@ void cmGlobalGenerator::EnableLanguage(const char* lang, putenv(envCXX); } } - - // check for a Java compiler and configure it + // check for a Java compiler and configure it if(!isLocal && !this->GetLanguageEnabled("JAVA") && strcmp(lang, "JAVA") == 0) @@ -171,18 +170,22 @@ void cmGlobalGenerator::EnableLanguage(const char* lang, fpath = rootBin; fpath += "/CMakeCCompiler.cmake"; mf->ReadListFile(0,fpath.c_str()); + this->SetLanguageEnabled("C"); } if(strcmp(lang, "CXX") == 0 && !mf->GetDefinition("CMAKE_CXX_COMPILER_LOADED")) { fpath = rootBin; fpath += "/CMakeCXXCompiler.cmake"; mf->ReadListFile(0,fpath.c_str()); + this->SetLanguageEnabled("CXX"); + } if(strcmp(lang, "JAVA") == 0 && !mf->GetDefinition("CMAKE_JAVA_COMPILER_LOADED")) { fpath = rootBin; fpath += "/CMakeJavaCompiler.cmake"; mf->ReadListFile(0,fpath.c_str()); + this->SetLanguageEnabled("JAVA"); } if ( lang[0] == 'C' && !mf->GetDefinition("CMAKE_SYSTEM_SPECIFIC_INFORMATION_LOADED")) { |