mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-26 00:00:39 -05:00
Code Issues Packages Projects Releases Wiki Activity

cmGlobalGenerator::PrintCompilerAdvice: use cmProp as augment

Browse Source
This commit is contained in:
Marc Chevrier
2021-09-18 11:05:36 +02:00
parent 062432a6bc
commit dffa3f485c
8 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmGlobalGenerator.cxx
+2 -2
View File
@@ -838,7 +838,7 @@ void cmGlobalGenerator::EnableLanguage(
cmSystemTools::RemoveFile(compilerLangFile); cmSystemTools::RemoveFile(compilerLangFile);
if (!this->CMakeInstance->GetIsInTryCompile()) { if (!this->CMakeInstance->GetIsInTryCompile()) {
this->PrintCompilerAdvice(noCompiler, lang, this->PrintCompilerAdvice(noCompiler, lang,
cmToCStr(mf->GetDefinition(compilerEnv))); mf->GetDefinition(compilerEnv));
mf->IssueMessage(MessageType::FATAL_ERROR, noCompiler.str()); mf->IssueMessage(MessageType::FATAL_ERROR, noCompiler.str());
fatalError = true; fatalError = true;
} }
@@ -922,7 +922,7 @@ void cmGlobalGenerator::EnableLanguage(
void cmGlobalGenerator::PrintCompilerAdvice(std::ostream& os, void cmGlobalGenerator::PrintCompilerAdvice(std::ostream& os,
std::string const& lang, std::string const& lang,
const char* envVar) const cmProp envVar) const
{ {
// Subclasses override this method if they do not support this advice. // Subclasses override this method if they do not support this advice.
os << "Tell CMake where to find the compiler by setting "; os << "Tell CMake where to find the compiler by setting ";
Source/cmGlobalGenerator.h
+1 -1
View File
@@ -550,7 +550,7 @@ protected:
virtual bool CheckLanguages(std::vector<std::string> const& languages, virtual bool CheckLanguages(std::vector<std::string> const& languages,
cmMakefile* mf) const; cmMakefile* mf) const;
virtual void PrintCompilerAdvice(std::ostream& os, std::string const& lang, virtual void PrintCompilerAdvice(std::ostream& os, std::string const& lang,
const char* envVar) const; cmProp envVar) const;
virtual bool ComputeTargetDepends(); virtual bool ComputeTargetDepends();
Source/cmGlobalJOMMakefileGenerator.cxx
+3 -2
View File
@@ -39,8 +39,9 @@ void cmGlobalJOMMakefileGenerator::GetDocumentation(
entry.Brief = "Generates JOM makefiles."; entry.Brief = "Generates JOM makefiles.";
} }
void cmGlobalJOMMakefileGenerator::PrintCompilerAdvice( void cmGlobalJOMMakefileGenerator::PrintCompilerAdvice(std::ostream& os,
std::ostream& os, std::string const& lang, const char* envVar) const std::string const& lang,
cmProp envVar) const
{ {
if (lang == "CXX" || lang == "C") { if (lang == "CXX" || lang == "C") {
/* clang-format off */ /* clang-format off */
Source/cmGlobalJOMMakefileGenerator.h
+1 -1
View File
@@ -50,5 +50,5 @@ protected:
private: private:
void PrintCompilerAdvice(std::ostream& os, std::string const& lang, void PrintCompilerAdvice(std::ostream& os, std::string const& lang,
const char* envVar) const override; cmProp envVar) const override;
}; };
Source/cmGlobalNMakeMakefileGenerator.cxx
+1 -1
View File
@@ -81,7 +81,7 @@ void cmGlobalNMakeMakefileGenerator::GetDocumentation(
} }
void cmGlobalNMakeMakefileGenerator::PrintCompilerAdvice( void cmGlobalNMakeMakefileGenerator::PrintCompilerAdvice(
std::ostream& os, std::string const& lang, const char* envVar) const std::ostream& os, std::string const& lang, cmProp envVar) const
{ {
if (lang == "CXX" || lang == "C") { if (lang == "CXX" || lang == "C") {
/* clang-format off */ /* clang-format off */
Source/cmGlobalNMakeMakefileGenerator.h
+1 -1
View File
@@ -61,5 +61,5 @@ private:
void CheckNMakeFeatures(); void CheckNMakeFeatures();
void PrintCompilerAdvice(std::ostream& os, std::string const& lang, void PrintCompilerAdvice(std::ostream& os, std::string const& lang,
const char* envVar) const override; cmProp envVar) const override;
}; };
Source/cmGlobalVisualStudioGenerator.h
+1 -1
View File
@@ -201,7 +201,7 @@ protected:
private: private:
virtual std::string GetVSMakeProgram() = 0; virtual std::string GetVSMakeProgram() = 0;
void PrintCompilerAdvice(std::ostream&, std::string const&, void PrintCompilerAdvice(std::ostream&, std::string const&,
const char*) const override cmProp) const override
{ {
} }
Source/cmGlobalXCodeGenerator.h
+1 -1
View File
@@ -327,7 +327,7 @@ private:
bool XcodeBuildCommandInitialized; bool XcodeBuildCommandInitialized;
void PrintCompilerAdvice(std::ostream&, std::string const&, void PrintCompilerAdvice(std::ostream&, std::string const&,
const char*) const override cmProp) const override
{ {
} }