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

BUG: -fail with error if the CMake<LANG>Information.cmake file wasn't found 

ENH: -if no compiler has been found, don't test it, and also remove the compiler
information file again. This makes optionally enabling a language work
better.

Alex
This commit is contained in:
Alexander Neundorf 2008-06-10 18:28:01 -04:00
parent 4543a3ea05
commit 3e909b5908
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Source/cmGlobalGenerator.cxx
View File

@ -410,23 +410,43 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
fpath = "CMake"; fpath = "CMake";
fpath += lang; fpath += lang;
fpath += "Information.cmake"; fpath += "Information.cmake";
fpath = mf->GetModulesFile(fpath.c_str()); std::string informationFile = mf->GetModulesFile(fpath.c_str());
if(!mf->ReadListFile(0,fpath.c_str())) if (informationFile.empty())
{ {
cmSystemTools::Error("Could not find cmake module file:", cmSystemTools::Error("Could not find cmake module file:",
fpath.c_str()); fpath.c_str());
} }
else if(!mf->ReadListFile(0, informationFile.c_str()))
{
cmSystemTools::Error("Could not process cmake module file:",
informationFile.c_str());
}
} }
if (needSetLanguageEnabledMaps[lang]) if (needSetLanguageEnabledMaps[lang])
{ {
this->SetLanguageEnabledMaps(lang, mf); this->SetLanguageEnabledMaps(lang, mf);
} }
std::string compilerName = "CMAKE_";
compilerName += lang;
compilerName += "_COMPILER";
std::string compilerLangFile = rootBin;
compilerLangFile += "/CMake";
compilerLangFile += lang;
compilerLangFile += "Compiler.cmake";
// Test the compiler for the language just setup // Test the compiler for the language just setup
// (but only if a compiler has been actually found)
// At this point we should have enough info for a try compile // At this point we should have enough info for a try compile
// which is used in the backward stuff // which is used in the backward stuff
// If the language is untested then test it now with a try compile. // If the language is untested then test it now with a try compile.
if(needTestLanguage[lang]) if (!mf->IsSet(compilerName.c_str()))
{
// if the compiler did not work, then remove the
// CMake(LANG)Compiler.cmake file so that it will get tested the
// next time cmake is run
cmSystemTools::RemoveFile(compilerLangFile.c_str());
}
else if(needTestLanguage[lang])
{ {
if (!this->CMakeInstance->GetIsInTryCompile()) if (!this->CMakeInstance->GetIsInTryCompile())
{ {
@ -447,11 +467,7 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
// next time cmake is run // next time cmake is run
if(!mf->IsOn(compilerWorks.c_str())) if(!mf->IsOn(compilerWorks.c_str()))
{ {
fpath = rootBin; cmSystemTools::RemoveFile(compilerLangFile.c_str());
fpath += "/CMake";
fpath += lang;
fpath += "Compiler.cmake";
cmSystemTools::RemoveFile(fpath.c_str());
} }
else else
{ {