diff options
author | Brad King <brad.king@kitware.com> | 2014-09-18 13:25:26 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2014-09-18 13:25:26 (GMT) |
commit | 1b549a5c6494404f5cfd3d1d113f0b56a22c78f0 (patch) | |
tree | 50b51d99742f4d4a11286be4f5bc2f405366ae79 /Source/cmGlobalGenerator.cxx | |
parent | 201cc6fe095f1a0abfc34bb6482d933cc12ff055 (diff) | |
download | CMake-1b549a5c6494404f5cfd3d1d113f0b56a22c78f0.zip CMake-1b549a5c6494404f5cfd3d1d113f0b56a22c78f0.tar.gz CMake-1b549a5c6494404f5cfd3d1d113f0b56a22c78f0.tar.bz2 |
enable_language: Fix error messages on missing modules (#15155)
In cmGlobalGenerator::EnableLanguage, fix error messages for missing
module files to actually name the missing module instead of using the
empty string returned by GetModulesFile.
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
-rw-r--r-- | Source/cmGlobalGenerator.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 4375114..6a4adc0 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -506,8 +506,8 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages, fpath = mf->GetModulesFile("CMakeSystemSpecificInitialize.cmake"); if(!mf->ReadListFile(0,fpath.c_str())) { - cmSystemTools::Error("Could not find cmake module file: ", - fpath.c_str()); + cmSystemTools::Error("Could not find cmake module file: " + "CMakeSystemSpecificInitialize.cmake"); } } @@ -575,7 +575,7 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages, if(!mf->ReadListFile(0,determineFile.c_str())) { cmSystemTools::Error("Could not find cmake module file: ", - determineFile.c_str()); + determineCompiler.c_str()); } needTestLanguage[lang] = true; // 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"); if(!mf->ReadListFile(0,fpath.c_str())) { - cmSystemTools::Error("Could not find cmake module file: ", - fpath.c_str()); + cmSystemTools::Error("Could not find cmake module file: " + "CMakeSystemSpecificInformation.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())) { cmSystemTools::Error("Could not find cmake module file: ", - ifpath.c_str()); + testLang.c_str()); } std::string compilerWorks = "CMAKE_"; compilerWorks += lang; |