diff options
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 4 | ||||
| -rw-r--r-- | Source/cmGlobalGenerator.h | 2 | ||||
| -rw-r--r-- | Source/cmGlobalJOMMakefileGenerator.cxx | 5 | ||||
| -rw-r--r-- | Source/cmGlobalJOMMakefileGenerator.h | 2 | ||||
| -rw-r--r-- | Source/cmGlobalNMakeMakefileGenerator.cxx | 2 | ||||
| -rw-r--r-- | Source/cmGlobalNMakeMakefileGenerator.h | 2 | ||||
| -rw-r--r-- | Source/cmGlobalVisualStudioGenerator.h | 2 | ||||
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.h | 2 |
8 files changed, 11 insertions, 10 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index fd1a197..1c3d2c2 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -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 "; diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h index 34646d9..49a1a26 100644 --- a/Source/cmGlobalGenerator.h +++ b/Source/cmGlobalGenerator.h @@ -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(); diff --git a/Source/cmGlobalJOMMakefileGenerator.cxx b/Source/cmGlobalJOMMakefileGenerator.cxx index fc3123a..0d474e5 100644 --- a/Source/cmGlobalJOMMakefileGenerator.cxx +++ b/Source/cmGlobalJOMMakefileGenerator.cxx @@ -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 */ diff --git a/Source/cmGlobalJOMMakefileGenerator.h b/Source/cmGlobalJOMMakefileGenerator.h index 2d58f91..cc581df 100644 --- a/Source/cmGlobalJOMMakefileGenerator.h +++ b/Source/cmGlobalJOMMakefileGenerator.h @@ -50,5 +50,5 @@ protected: private: void PrintCompilerAdvice(std::ostream& os, std::string const& lang, - const char* envVar) const override; + cmProp envVar) const override; }; diff --git a/Source/cmGlobalNMakeMakefileGenerator.cxx b/Source/cmGlobalNMakeMakefileGenerator.cxx index 5ca8d52..2bc668c 100644 --- a/Source/cmGlobalNMakeMakefileGenerator.cxx +++ b/Source/cmGlobalNMakeMakefileGenerator.cxx @@ -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 */ diff --git a/Source/cmGlobalNMakeMakefileGenerator.h b/Source/cmGlobalNMakeMakefileGenerator.h index 402b89f..a48a55e 100644 --- a/Source/cmGlobalNMakeMakefileGenerator.h +++ b/Source/cmGlobalNMakeMakefileGenerator.h @@ -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; }; diff --git a/Source/cmGlobalVisualStudioGenerator.h b/Source/cmGlobalVisualStudioGenerator.h index 151f39f..57ada62 100644 --- a/Source/cmGlobalVisualStudioGenerator.h +++ b/Source/cmGlobalVisualStudioGenerator.h @@ -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 { } diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h index 1e1b344..e54818e 100644 --- a/Source/cmGlobalXCodeGenerator.h +++ b/Source/cmGlobalXCodeGenerator.h @@ -327,7 +327,7 @@ private: bool XcodeBuildCommandInitialized; void PrintCompilerAdvice(std::ostream&, std::string const&, - const char*) const override + cmProp) const override { } |