diff options
| author | Brad King <brad.king@kitware.com> | 2014-09-22 13:13:11 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-09-22 13:13:11 (GMT) |
| commit | 2b1b1b1cfaf88d494175b44f3c5b17d4c0842dd7 (patch) | |
| tree | 3198d7918d86339c1a7b74325f7151147982a2c9 | |
| parent | 3303b5f8b462d12af3874cee1b97fabfee6ffb3e (diff) | |
| parent | 1b549a5c6494404f5cfd3d1d113f0b56a22c78f0 (diff) | |
| download | CMake-2b1b1b1cfaf88d494175b44f3c5b17d4c0842dd7.zip CMake-2b1b1b1cfaf88d494175b44f3c5b17d4c0842dd7.tar.gz CMake-2b1b1b1cfaf88d494175b44f3c5b17d4c0842dd7.tar.bz2 | |
Merge topic 'fix-enable_language-missing-module-errors'
1b549a5c enable_language: Fix error messages on missing modules (#15155)
| -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; |