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

Merge topic 'minor-cleanups' 

2175e5bf cmGlobalGenerator: Make IsMultiConfig() const
This commit is contained in:
Brad King 2016-06-02 09:44:53 -04:00 committed by CMake Topic Stage
parent c6bcb6fa1e 2175e5bfa5
commit f1ff6301ea
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmGlobalGenerator.h
View File

@ -319,7 +319,7 @@ public:
/** Return true if the generated build tree may contain multiple builds. /** Return true if the generated build tree may contain multiple builds.
i.e. "Can I build Debug and Release in the same tree?" */ i.e. "Can I build Debug and Release in the same tree?" */
virtual bool IsMultiConfig() { return false; } virtual bool IsMultiConfig() const { return false; }
std::string GetSharedLibFlagsForLanguage(std::string const& lang) const; std::string GetSharedLibFlagsForLanguage(std::string const& lang) const;

2
Source/cmGlobalVisualStudioGenerator.h
View File

@ -85,7 +85,7 @@ public:
/** Return true if the generated build tree may contain multiple builds. /** Return true if the generated build tree may contain multiple builds.
i.e. "Can I build Debug and Release in the same tree?" */ i.e. "Can I build Debug and Release in the same tree?" */
virtual bool IsMultiConfig() { return true; } virtual bool IsMultiConfig() const { return true; }
/** Return true if building for Windows CE */ /** Return true if building for Windows CE */
virtual bool TargetsWindowsCE() const { return false; } virtual bool TargetsWindowsCE() const { return false; }

2
Source/cmGlobalXCodeGenerator.cxx
View File

@ -3437,7 +3437,7 @@ std::string cmGlobalXCodeGenerator::ComputeInfoPListLocation(
// Return true if the generated build tree may contain multiple builds. // Return true if the generated build tree may contain multiple builds.
// i.e. "Can I build Debug and Release in the same tree?" // i.e. "Can I build Debug and Release in the same tree?"
bool cmGlobalXCodeGenerator::IsMultiConfig() bool cmGlobalXCodeGenerator::IsMultiConfig() const
{ {
// Old Xcode 1.5 is single config: // Old Xcode 1.5 is single config:
if (this->XcodeVersion == 15) { if (this->XcodeVersion == 15) {

2
Source/cmGlobalXCodeGenerator.h
View File

@ -79,7 +79,7 @@ public:
/** Return true if the generated build tree may contain multiple builds. /** Return true if the generated build tree may contain multiple builds.
i.e. "Can I build Debug and Release in the same tree?" */ i.e. "Can I build Debug and Release in the same tree?" */
virtual bool IsMultiConfig(); virtual bool IsMultiConfig() const;
virtual bool SetGeneratorToolset(std::string const& ts, cmMakefile* mf); virtual bool SetGeneratorToolset(std::string const& ts, cmMakefile* mf);
void AppendFlag(std::string& flags, std::string const& flag); void AppendFlag(std::string& flags, std::string const& flag);