mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-11 16:32:14 -06: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

4
Source/cmGlobalGenerator.cxx
View File

@@ -838,7 +838,7 @@ void cmGlobalGenerator::EnableLanguage(
cmSystemTools::RemoveFile(compilerLangFile);
if (!this->CMakeInstance->GetIsInTryCompile()) {
this->PrintCompilerAdvice(noCompiler, lang,
cmToCStr(mf->GetDefinition(compilerEnv)));
mf->GetDefinition(compilerEnv));
mf->IssueMessage(MessageType::FATAL_ERROR, noCompiler.str());
fatalError = true;
}
@@ -922,7 +922,7 @@ void cmGlobalGenerator::EnableLanguage(
void cmGlobalGenerator::PrintCompilerAdvice(std::ostream& os,
std::string const& lang,
const char* envVar) const
cmProp envVar) const
{
// Subclasses override this method if they do not support this advice.
os << "Tell CMake where to find the compiler by setting ";

2
Source/cmGlobalGenerator.h
View File

@@ -550,7 +550,7 @@ protected:
virtual bool CheckLanguages(std::vector<std::string> const& languages,
cmMakefile* mf) const;
virtual void PrintCompilerAdvice(std::ostream& os, std::string const& lang,
const char* envVar) const;
cmProp envVar) const;
virtual bool ComputeTargetDepends();

5
Source/cmGlobalJOMMakefileGenerator.cxx
View File

@@ -39,8 +39,9 @@ void cmGlobalJOMMakefileGenerator::GetDocumentation(
entry.Brief = "Generates JOM makefiles.";
}
void cmGlobalJOMMakefileGenerator::PrintCompilerAdvice(
std::ostream& os, std::string const& lang, const char* envVar) const
void cmGlobalJOMMakefileGenerator::PrintCompilerAdvice(std::ostream& os,
std::string const& lang,
cmProp envVar) const
{
if (lang == "CXX" || lang == "C") {
/* clang-format off */

2
Source/cmGlobalJOMMakefileGenerator.h
View File

@@ -50,5 +50,5 @@ protected:
private:
void PrintCompilerAdvice(std::ostream& os, std::string const& lang,
const char* envVar) const override;
cmProp envVar) const override;
};

2
Source/cmGlobalNMakeMakefileGenerator.cxx
View File

@@ -81,7 +81,7 @@ void cmGlobalNMakeMakefileGenerator::GetDocumentation(
}
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") {
/* clang-format off */

2
Source/cmGlobalNMakeMakefileGenerator.h
View File

@@ -61,5 +61,5 @@ private:
void CheckNMakeFeatures();
void PrintCompilerAdvice(std::ostream& os, std::string const& lang,
const char* envVar) const override;
cmProp envVar) const override;
};

2
Source/cmGlobalVisualStudioGenerator.h
View File

@@ -201,7 +201,7 @@ protected:
private:
virtual std::string GetVSMakeProgram() = 0;
void PrintCompilerAdvice(std::ostream&, std::string const&,
const char*) const override
cmProp) const override
{
}

2
Source/cmGlobalXCodeGenerator.h
View File

@@ -327,7 +327,7 @@ private:
bool XcodeBuildCommandInitialized;
void PrintCompilerAdvice(std::ostream&, std::string const&,
const char*) const override
cmProp) const override
{
}