kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmGlobalGenerator: Make SelectMakeProgram const.

This commit is contained in:
Stephen Kelly 2014-01-10 13:51:29 +01:00
parent b4ff38a5ef
commit 2cbf031190
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmGlobalGenerator.cxx
View File

@ -90,7 +90,7 @@ bool cmGlobalGenerator::SetGeneratorToolset(std::string const& ts)
} }
std::string cmGlobalGenerator::SelectMakeProgram(const char* makeProgram, std::string cmGlobalGenerator::SelectMakeProgram(const char* makeProgram,
std::string makeDefault) std::string makeDefault) const
{ {
if(cmSystemTools::IsOff(makeProgram)) if(cmSystemTools::IsOff(makeProgram))
{ {
@ -111,7 +111,7 @@ std::string cmGlobalGenerator::SelectMakeProgram(const char* makeProgram,
void cmGlobalGenerator::ResolveLanguageCompiler(const std::string &lang, void cmGlobalGenerator::ResolveLanguageCompiler(const std::string &lang,
cmMakefile *mf, cmMakefile *mf,
bool optional) bool optional) const
{ {
std::string langComp = "CMAKE_"; std::string langComp = "CMAKE_";
langComp += lang; langComp += lang;
@ -723,7 +723,7 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void cmGlobalGenerator::PrintCompilerAdvice(std::ostream& os, void cmGlobalGenerator::PrintCompilerAdvice(std::ostream& os,
std::string lang, std::string lang,
const char* envVar) const char* 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 << os <<
@ -744,7 +744,7 @@ void cmGlobalGenerator::PrintCompilerAdvice(std::ostream& os,
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void cmGlobalGenerator::CheckCompilerIdCompatibility(cmMakefile* mf, void cmGlobalGenerator::CheckCompilerIdCompatibility(cmMakefile* mf,
std::string lang) std::string lang) const
{ {
std::string compilerIdVar = "CMAKE_" + lang + "_COMPILER_ID"; std::string compilerIdVar = "CMAKE_" + lang + "_COMPILER_ID";
const char* compilerId = mf->GetDefinition(compilerIdVar.c_str()); const char* compilerId = mf->GetDefinition(compilerIdVar.c_str());

8
Source/cmGlobalGenerator.h
View File

@ -93,7 +93,7 @@ public:
* Intended to be called from EnableLanguage. * Intended to be called from EnableLanguage.
*/ */
void ResolveLanguageCompiler(const std::string &lang, cmMakefile *mf, void ResolveLanguageCompiler(const std::string &lang, cmMakefile *mf,
bool optional); bool optional) const;
/** /**
* Try to determine system infomation, get it from another generator * Try to determine system infomation, get it from another generator
@ -342,7 +342,7 @@ protected:
void CreateQtAutoGeneratorsTargets(AutogensType& autogens); void CreateQtAutoGeneratorsTargets(AutogensType& autogens);
std::string SelectMakeProgram(const char* makeProgram, std::string SelectMakeProgram(const char* makeProgram,
std::string makeDefault = ""); std::string makeDefault = "") const;
// Fill the ProjectMap, this must be called after LocalGenerators // Fill the ProjectMap, this must be called after LocalGenerators
// has been populated. // has been populated.
@ -418,8 +418,8 @@ private:
void FinalizeTargetCompileInfo(); void FinalizeTargetCompileInfo();
virtual void PrintCompilerAdvice(std::ostream& os, std::string lang, virtual void PrintCompilerAdvice(std::ostream& os, std::string lang,
const char* envVar); const char* envVar) const;
void CheckCompilerIdCompatibility(cmMakefile* mf, std::string lang); void CheckCompilerIdCompatibility(cmMakefile* mf, std::string lang) const;
cmExternalMakefileProjectGenerator* ExtraGenerator; cmExternalMakefileProjectGenerator* ExtraGenerator;

2
Source/cmGlobalVisualStudioGenerator.h
View File

@ -110,7 +110,7 @@ protected:
private: private:
virtual std::string GetVSMakeProgram() = 0; virtual std::string GetVSMakeProgram() = 0;
void PrintCompilerAdvice(std::ostream&, std::string, const char*) {} void PrintCompilerAdvice(std::ostream&, std::string, const char*) const {}
void ComputeTargetObjects(cmGeneratorTarget* gt) const; void ComputeTargetObjects(cmGeneratorTarget* gt) const;
void FollowLinkDepends(cmTarget const* target, void FollowLinkDepends(cmTarget const* target,

2
Source/cmGlobalXCodeGenerator.h
View File

@ -212,7 +212,7 @@ protected:
std::vector<cmXCodeObject*> XCodeObjects; std::vector<cmXCodeObject*> XCodeObjects;
cmXCodeObject* RootObject; cmXCodeObject* RootObject;
private: private:
void PrintCompilerAdvice(std::ostream&, std::string, const char*) {} void PrintCompilerAdvice(std::ostream&, std::string, const char*) const {}
void ComputeTargetObjects(cmGeneratorTarget* gt) const; void ComputeTargetObjects(cmGeneratorTarget* gt) const;
std::string GetObjectsNormalDirectory( std::string GetObjectsNormalDirectory(