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

Merge topic 'fix-enable_language-missing-module-errors' 

1b549a5c enable_language: Fix error messages on missing modules (#15155)
This commit is contained in:
Brad King 2014-09-22 09:13:11 -04:00 committed by CMake Topic Stage
parent 3303b5f8b4 1b549a5c64
commit 2b1b1b1cfa
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/cmGlobalGenerator.cxx
View File

@ -506,8 +506,8 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
fpath = mf->GetModulesFile("CMakeSystemSpecificInitialize.cmake"); fpath = mf->GetModulesFile("CMakeSystemSpecificInitialize.cmake");
if(!mf->ReadListFile(0,fpath.c_str())) if(!mf->ReadListFile(0,fpath.c_str()))
{ {
cmSystemTools::Error("Could not find cmake module file: ", cmSystemTools::Error("Could not find cmake module file: "
fpath.c_str()); "CMakeSystemSpecificInitialize.cmake");
} }
} }
@ -575,7 +575,7 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
if(!mf->ReadListFile(0,determineFile.c_str())) if(!mf->ReadListFile(0,determineFile.c_str()))
{ {
cmSystemTools::Error("Could not find cmake module file: ", cmSystemTools::Error("Could not find cmake module file: ",
determineFile.c_str()); determineCompiler.c_str());
} }
needTestLanguage[lang] = true; needTestLanguage[lang] = true;
// Some generators like visual studio should not use the env variables // Some generators like visual studio should not use the env variables
@ -627,8 +627,8 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
fpath = mf->GetModulesFile("CMakeSystemSpecificInformation.cmake"); fpath = mf->GetModulesFile("CMakeSystemSpecificInformation.cmake");
if(!mf->ReadListFile(0,fpath.c_str())) if(!mf->ReadListFile(0,fpath.c_str()))
{ {
cmSystemTools::Error("Could not find cmake module file: ", cmSystemTools::Error("Could not find cmake module file: "
fpath.c_str()); "CMakeSystemSpecificInformation.cmake");
} }
} }
// loop over languages again loading CMake(LANG)Information.cmake // loop over languages again loading CMake(LANG)Information.cmake
@ -744,7 +744,7 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
if(!mf->ReadListFile(0,ifpath.c_str())) if(!mf->ReadListFile(0,ifpath.c_str()))
{ {
cmSystemTools::Error("Could not find cmake module file: ", cmSystemTools::Error("Could not find cmake module file: ",
ifpath.c_str()); testLang.c_str());
} }
std::string compilerWorks = "CMAKE_"; std::string compilerWorks = "CMAKE_";
compilerWorks += lang; compilerWorks += lang;