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

cmGlobalGenerator: Make CheckALLOW_DUPLICATE_CUSTOM_TARGETS const

This commit is contained in:
Stephen Kelly 2014-01-10 13:35:58 +01:00
parent 8aeddf1f03
commit b4ff38a5ef
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.cxx
View File

@ -1076,7 +1076,7 @@ void cmGlobalGenerator::AddCMP0042WarnTarget(const std::string& target)
this->CMP0042WarnTargets.insert(target); this->CMP0042WarnTargets.insert(target);
} }
bool cmGlobalGenerator::CheckALLOW_DUPLICATE_CUSTOM_TARGETS() bool cmGlobalGenerator::CheckALLOW_DUPLICATE_CUSTOM_TARGETS() const
{ {
// If the property is not enabled then okay. // If the property is not enabled then okay.
if(!this->CMakeInstance if(!this->CMakeInstance

2
Source/cmGlobalGenerator.h
View File

@ -334,7 +334,7 @@ protected:
virtual bool ComputeTargetDepends(); virtual bool ComputeTargetDepends();
virtual bool CheckALLOW_DUPLICATE_CUSTOM_TARGETS(); virtual bool CheckALLOW_DUPLICATE_CUSTOM_TARGETS() const;
bool CheckTargets(); bool CheckTargets();
typedef std::vector<std::pair<cmQtAutoGenerators, typedef std::vector<std::pair<cmQtAutoGenerators,

2
Source/cmGlobalNinjaGenerator.h
View File

@ -304,7 +304,7 @@ protected:
/// Overloaded methods. /// Overloaded methods.
/// @see cmGlobalGenerator::CheckALLOW_DUPLICATE_CUSTOM_TARGETS() /// @see cmGlobalGenerator::CheckALLOW_DUPLICATE_CUSTOM_TARGETS()
virtual bool CheckALLOW_DUPLICATE_CUSTOM_TARGETS() { return true; } virtual bool CheckALLOW_DUPLICATE_CUSTOM_TARGETS() const { return true; }
private: private:

2
Source/cmGlobalUnixMakefileGenerator3.h
View File

@ -161,7 +161,7 @@ protected:
const char* GetRebuildCacheTargetName() const { return "rebuild_cache"; } const char* GetRebuildCacheTargetName() const { return "rebuild_cache"; }
const char* GetCleanTargetName() const { return "clean"; } const char* GetCleanTargetName() const { return "clean"; }
virtual bool CheckALLOW_DUPLICATE_CUSTOM_TARGETS() { return true; } virtual bool CheckALLOW_DUPLICATE_CUSTOM_TARGETS() const { return true; }
// Some make programs (Borland) do not keep a rule if there are no // Some make programs (Borland) do not keep a rule if there are no
// dependencies or commands. This is a problem for creating rules // dependencies or commands. This is a problem for creating rules