From 803f1901784937e40717fbf6cc675eb7aacbcce1 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Thu, 22 Oct 2015 00:49:54 +0200 Subject: Xcode: Remove trailing semicolon --- Source/cmXCodeObject.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/cmXCodeObject.h b/Source/cmXCodeObject.h index 0f0548b..975d94b 100644 --- a/Source/cmXCodeObject.h +++ b/Source/cmXCodeObject.h @@ -75,7 +75,7 @@ public: } static void Indent(int level, std::ostream& out); void Print(std::ostream& out); - virtual void PrintComment(std::ostream&) {}; + virtual void PrintComment(std::ostream&) {} static void PrintList(std::vector const&, std::ostream& out); -- cgit v0.12 From d50c4220e29ef0b7366f3e1812f0a79736f2c18e Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Thu, 22 Oct 2015 00:50:12 +0200 Subject: Xcode: Fix typo in comment --- Source/cmXCodeObject.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/cmXCodeObject.h b/Source/cmXCodeObject.h index 975d94b..bd0f43f 100644 --- a/Source/cmXCodeObject.h +++ b/Source/cmXCodeObject.h @@ -105,7 +105,7 @@ public: } return 0; } - // serach the attribute list for an object of the specified type + // search the attribute list for an object of the specified type cmXCodeObject* GetObject(cmXCodeObject::PBXType t) { for(std::vector::iterator i = this->List.begin(); -- cgit v0.12 From a03f3d0e01edcb617813144626400058a5c0a177 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Thu, 22 Oct 2015 00:50:53 +0200 Subject: cmFunctionBlocker: Constify method --- Source/cmFunctionBlocker.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/cmFunctionBlocker.h b/Source/cmFunctionBlocker.h index 68bf762..a3b8078 100644 --- a/Source/cmFunctionBlocker.h +++ b/Source/cmFunctionBlocker.h @@ -39,7 +39,7 @@ public: /** Set/Get the context in which this blocker is created. */ void SetStartingContext(cmListFileContext const& lfc) { this->StartingContext = lfc; } - cmListFileContext const& GetStartingContext() + cmListFileContext const& GetStartingContext() const { return this->StartingContext; } private: cmListFileContext StartingContext; -- cgit v0.12 From 331023ae06b795a1733ae03dce2ce2197ca1c36a Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Thu, 22 Oct 2015 00:51:25 +0200 Subject: Export: Remove unused variable --- Source/cmExportBuildFileGenerator.cxx | 1 - 1 file changed, 1 deletion(-) diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx index 23c11d7..a99c50b 100644 --- a/Source/cmExportBuildFileGenerator.cxx +++ b/Source/cmExportBuildFileGenerator.cxx @@ -36,7 +36,6 @@ void cmExportBuildFileGenerator::Compute(cmLocalGenerator* lg) //---------------------------------------------------------------------------- bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os) { - std::vector allTargets; { std::string expectedTargets; std::string sep; -- cgit v0.12 From d90c9738da7003b966036c70727611b17d17f3a6 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Thu, 22 Oct 2015 01:06:46 +0200 Subject: Makefiles: Remove some unneeded casts --- Source/cmGlobalUnixMakefileGenerator3.cxx | 5 ++--- Source/cmGlobalUnixMakefileGenerator3.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx index b4a915c..c4e28ca 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -158,8 +158,7 @@ void cmGlobalUnixMakefileGenerator3::Generate() } for(unsigned int i = 0; i < this->LocalGenerators.size(); ++i) { - cmLocalUnixMakefileGenerator3 *lg = - static_cast(this->LocalGenerators[i]); + cmLocalGenerator *lg = this->LocalGenerators[i]; std::string markFileName = lg->GetCurrentBinaryDirectory(); markFileName += "/"; markFileName += cmake::GetCMakeFilesDirectory(); @@ -982,7 +981,7 @@ cmGlobalUnixMakefileGenerator3 //---------------------------------------------------------------------------- size_t cmGlobalUnixMakefileGenerator3 -::CountProgressMarksInAll(cmLocalUnixMakefileGenerator3* lg) +::CountProgressMarksInAll(cmLocalGenerator* lg) { size_t count = 0; std::set emitted; diff --git a/Source/cmGlobalUnixMakefileGenerator3.h b/Source/cmGlobalUnixMakefileGenerator3.h index 63ffcb4..54fdc0e 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.h +++ b/Source/cmGlobalUnixMakefileGenerator3.h @@ -198,7 +198,7 @@ protected: size_t CountProgressMarksInTarget(cmGeneratorTarget const* target, std::set& emitted); - size_t CountProgressMarksInAll(cmLocalUnixMakefileGenerator3* lg); + size_t CountProgressMarksInAll(cmLocalGenerator* lg); cmGeneratedFileStream *CommandDatabase; private: -- cgit v0.12 From ce43ed2cc14f96c56441da9908053737efbaaf2e Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Thu, 22 Oct 2015 00:29:36 +0200 Subject: Use LocalGenerator when possible --- Source/cmGlobalVisualStudioGenerator.cxx | 2 +- Source/cmLocalNinjaGenerator.cxx | 2 +- Source/cmLocalUnixMakefileGenerator3.cxx | 20 ++++++++++---------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx index b819dad..0488391 100644 --- a/Source/cmGlobalVisualStudioGenerator.cxx +++ b/Source/cmGlobalVisualStudioGenerator.cxx @@ -147,7 +147,7 @@ void cmGlobalVisualStudioGenerator::AddExtraIDETargets() void cmGlobalVisualStudioGenerator ::ComputeTargetObjectDirectory(cmGeneratorTarget* gt) const { - std::string dir = gt->Makefile->GetCurrentBinaryDirectory(); + std::string dir = gt->LocalGenerator->GetCurrentBinaryDirectory(); dir += "/"; std::string tgtDir = gt->LocalGenerator->GetTargetDirectory(gt); if(!tgtDir.empty()) diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx index 891c44e..e11571a 100644 --- a/Source/cmLocalNinjaGenerator.cxx +++ b/Source/cmLocalNinjaGenerator.cxx @@ -42,7 +42,7 @@ void cmLocalNinjaGenerator::Generate() // Compute the path to use when referencing the current output // directory from the top output directory. this->HomeRelativeOutputPath = - this->Convert(this->Makefile->GetCurrentBinaryDirectory(), HOME_OUTPUT); + this->Convert(this->GetCurrentBinaryDirectory(), HOME_OUTPUT); if(this->HomeRelativeOutputPath == ".") { this->HomeRelativeOutputPath = ""; diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index 34a50a3..27d631e 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -144,7 +144,7 @@ void cmLocalUnixMakefileGenerator3::ComputeHomeRelativeOutputPath() // Compute the path to use when referencing the current output // directory from the top output directory. this->HomeRelativeOutputPath = - this->Convert(this->Makefile->GetCurrentBinaryDirectory(), HOME_OUTPUT); + this->Convert(this->GetCurrentBinaryDirectory(), HOME_OUTPUT); if(this->HomeRelativeOutputPath == ".") { this->HomeRelativeOutputPath = ""; @@ -503,7 +503,7 @@ void cmLocalUnixMakefileGenerator3 //---------------------------------------------------------------------------- void cmLocalUnixMakefileGenerator3::WriteDirectoryInformationFile() { - std::string infoFileName = this->Makefile->GetCurrentBinaryDirectory(); + std::string infoFileName = this->GetCurrentBinaryDirectory(); infoFileName += cmake::GetCMakeFilesDirectory(); infoFileName += "/CMakeDirectoryInformation.cmake"; @@ -567,7 +567,7 @@ std::string cmLocalUnixMakefileGenerator3 ::ConvertToFullPath(const std::string& localPath) { - std::string dir = this->Makefile->GetCurrentBinaryDirectory(); + std::string dir = this->GetCurrentBinaryDirectory(); dir += "/"; dir += localPath; return dir; @@ -1064,7 +1064,7 @@ cmLocalUnixMakefileGenerator3 } // if the command specified a working directory use it. - std::string dir = this->Makefile->GetCurrentBinaryDirectory(); + std::string dir = this->GetCurrentBinaryDirectory(); std::string workingDir = ccg.GetWorkingDirectory(); if(!workingDir.empty()) { @@ -1214,7 +1214,7 @@ cmLocalUnixMakefileGenerator3 const std::vector& files, cmGeneratorTarget* target, const char* filename) { - std::string cleanfile = this->Makefile->GetCurrentBinaryDirectory(); + std::string cleanfile = this->GetCurrentBinaryDirectory(); cleanfile += "/"; cleanfile += this->GetTargetDirectory(target); cleanfile += "/cmake_clean"; @@ -1493,7 +1493,7 @@ bool cmLocalUnixMakefileGenerator3::UpdateDependencies(const char* tgtInfo, // If the directory information is newer than depend.internal, include dirs // may have changed. In this case discard all old dependencies. bool needRescanDirInfo = false; - std::string dirInfoFile = this->Makefile->GetCurrentBinaryDirectory(); + std::string dirInfoFile = this->GetCurrentBinaryDirectory(); dirInfoFile += cmake::GetCMakeFilesDirectory(); dirInfoFile += "/CMakeDirectoryInformation.cmake"; { @@ -1567,7 +1567,7 @@ cmLocalUnixMakefileGenerator3 // Read the directory information file. cmMakefile* mf = this->Makefile; bool haveDirectoryInfo = false; - std::string dirInfoFile = this->Makefile->GetCurrentBinaryDirectory(); + std::string dirInfoFile = this->GetCurrentBinaryDirectory(); dirInfoFile += cmake::GetCMakeFilesDirectory(); dirInfoFile += "/CMakeDirectoryInformation.cmake"; if(mf->ReadListFile(dirInfoFile.c_str()) && @@ -1828,7 +1828,7 @@ void cmLocalUnixMakefileGenerator3 std::vector commands; // Write the all rule. - std::string recursiveTarget = this->Makefile->GetCurrentBinaryDirectory(); + std::string recursiveTarget = this->GetCurrentBinaryDirectory(); recursiveTarget += "/all"; depends.push_back("cmake_check_build_system"); @@ -1872,7 +1872,7 @@ void cmLocalUnixMakefileGenerator3 depends, commands, true); // Write the clean rule. - recursiveTarget = this->Makefile->GetCurrentBinaryDirectory(); + recursiveTarget = this->GetCurrentBinaryDirectory(); recursiveTarget += "/clean"; commands.clear(); depends.clear(); @@ -1890,7 +1890,7 @@ void cmLocalUnixMakefileGenerator3 depends, commands, true); // Write the preinstall rule. - recursiveTarget = this->Makefile->GetCurrentBinaryDirectory(); + recursiveTarget = this->GetCurrentBinaryDirectory(); recursiveTarget += "/preinstall"; commands.clear(); depends.clear(); -- cgit v0.12 From b22e5d0ab71199b45f1f9f4e271f677dba602452 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Sat, 10 Oct 2015 18:27:44 +0200 Subject: Remove some obsolete declarations Ensure that cmStandardIncludes.h is included before any platform header in cmGeneratorExpressionEvaluator.h. That file needs to change as a result of removal of the cmMakefile.h header from cmGeneratorExpressionNode.h, affecting the compilation of cmGeneratorExpressionNode.cxx. On AIX we need to include our own headers first to get large file support macros defined consistently within system headers. The old order in this header worked only because it was always included after other headers. --- Source/cmComputeLinkDepends.h | 1 - Source/cmExtraKateGenerator.cxx | 1 - Source/cmExtraKateGenerator.h | 2 -- Source/cmGeneratorExpressionDAGChecker.cxx | 1 - Source/cmGeneratorExpressionEvaluator.h | 6 ++---- Source/cmGeneratorExpressionNode.cxx | 1 + Source/cmGeneratorExpressionNode.h | 2 -- Source/cmGeneratorExpressionParser.h | 2 -- Source/cmGlobalUnixMakefileGenerator3.cxx | 1 - Source/cmInstallDirectoryGenerator.cxx | 1 - Source/cmLocalVisualStudio10Generator.cxx | 1 - Source/cmTarget.h | 1 - Source/cmTestGenerator.cxx | 2 -- 13 files changed, 3 insertions(+), 19 deletions(-) diff --git a/Source/cmComputeLinkDepends.h b/Source/cmComputeLinkDepends.h index 889fb08..f10e4e4 100644 --- a/Source/cmComputeLinkDepends.h +++ b/Source/cmComputeLinkDepends.h @@ -13,7 +13,6 @@ #define cmComputeLinkDepends_h #include "cmStandardIncludes.h" -#include "cmTarget.h" #include "cmLinkItem.h" #include "cmGraphAdjacencyList.h" diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx index 1741acf..ff5d3ab 100644 --- a/Source/cmExtraKateGenerator.cxx +++ b/Source/cmExtraKateGenerator.cxx @@ -17,7 +17,6 @@ #include "cmake.h" #include "cmSourceFile.h" #include "cmGeneratedFileStream.h" -#include "cmTarget.h" #include "cmSystemTools.h" #include diff --git a/Source/cmExtraKateGenerator.h b/Source/cmExtraKateGenerator.h index b20d0a7..281c1ef 100644 --- a/Source/cmExtraKateGenerator.h +++ b/Source/cmExtraKateGenerator.h @@ -16,8 +16,6 @@ #include "cmExternalMakefileProjectGenerator.h" class cmLocalGenerator; -class cmMakefile; -class cmTarget; class cmGeneratedFileStream; /** \class cmExtraKateGenerator diff --git a/Source/cmGeneratorExpressionDAGChecker.cxx b/Source/cmGeneratorExpressionDAGChecker.cxx index 5eed89d..c3b0272 100644 --- a/Source/cmGeneratorExpressionDAGChecker.cxx +++ b/Source/cmGeneratorExpressionDAGChecker.cxx @@ -12,7 +12,6 @@ #include "cmGeneratorExpressionDAGChecker.h" -#include "cmMakefile.h" #include "cmLocalGenerator.h" #include "cmAlgorithms.h" diff --git a/Source/cmGeneratorExpressionEvaluator.h b/Source/cmGeneratorExpressionEvaluator.h index 7c1bd8c..407f83f 100644 --- a/Source/cmGeneratorExpressionEvaluator.h +++ b/Source/cmGeneratorExpressionEvaluator.h @@ -12,13 +12,11 @@ #ifndef cmGeneratorExpressionEvaluator_h #define cmGeneratorExpressionEvaluator_h -#include -#include - #include "cmListFileCache.h" #include "cmGeneratorExpressionContext.h" -class cmTarget; +#include +#include struct cmGeneratorExpressionDAGChecker; struct cmGeneratorExpressionNode; diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx index 7a7e4ff..af72123 100644 --- a/Source/cmGeneratorExpressionNode.cxx +++ b/Source/cmGeneratorExpressionNode.cxx @@ -14,6 +14,7 @@ #include "cmGlobalGenerator.h" #include "cmAlgorithms.h" #include "cmOutputConverter.h" +#include "cmMakefile.h" //---------------------------------------------------------------------------- std::string cmGeneratorExpressionNode::EvaluateDependentExpression( diff --git a/Source/cmGeneratorExpressionNode.h b/Source/cmGeneratorExpressionNode.h index db65db1..854811b 100644 --- a/Source/cmGeneratorExpressionNode.h +++ b/Source/cmGeneratorExpressionNode.h @@ -12,8 +12,6 @@ #ifndef cmGeneratorExpressionNode_h #define cmGeneratorExpressionNode_h -#include "cmMakefile.h" - #include "cmGeneratorExpressionEvaluator.h" #include "cmGeneratorExpressionParser.h" #include "cmGeneratorExpressionDAGChecker.h" diff --git a/Source/cmGeneratorExpressionParser.h b/Source/cmGeneratorExpressionParser.h index 28f1441..5bd6777 100644 --- a/Source/cmGeneratorExpressionParser.h +++ b/Source/cmGeneratorExpressionParser.h @@ -19,8 +19,6 @@ #include "cmListFileCache.h" -class cmMakefile; -class cmTarget; struct cmGeneratorExpressionEvaluator; //---------------------------------------------------------------------------- diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx index c4e28ca..2fa0598 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -15,7 +15,6 @@ #include "cmMakefile.h" #include "cmake.h" #include "cmGeneratedFileStream.h" -#include "cmSourceFile.h" #include "cmGeneratorTarget.h" #include "cmAlgorithms.h" diff --git a/Source/cmInstallDirectoryGenerator.cxx b/Source/cmInstallDirectoryGenerator.cxx index edd6a0e..ea27f61 100644 --- a/Source/cmInstallDirectoryGenerator.cxx +++ b/Source/cmInstallDirectoryGenerator.cxx @@ -11,7 +11,6 @@ ============================================================================*/ #include "cmInstallDirectoryGenerator.h" -#include "cmTarget.h" #include "cmGeneratorExpression.h" #include "cmLocalGenerator.h" diff --git a/Source/cmLocalVisualStudio10Generator.cxx b/Source/cmLocalVisualStudio10Generator.cxx index d59fdc6..d0784ad 100644 --- a/Source/cmLocalVisualStudio10Generator.cxx +++ b/Source/cmLocalVisualStudio10Generator.cxx @@ -10,7 +10,6 @@ See the License for more information. ============================================================================*/ #include "cmLocalVisualStudio10Generator.h" -#include "cmTarget.h" #include "cmMakefile.h" #include "cmVisualStudio10TargetGenerator.h" #include "cmGlobalVisualStudio10Generator.h" diff --git a/Source/cmTarget.h b/Source/cmTarget.h index 1cae94f..52ed578 100644 --- a/Source/cmTarget.h +++ b/Source/cmTarget.h @@ -30,7 +30,6 @@ class cmake; class cmMakefile; class cmSourceFile; class cmGlobalGenerator; -class cmComputeLinkInformation; class cmListFileBacktrace; class cmTarget; class cmGeneratorTarget; diff --git a/Source/cmTestGenerator.cxx b/Source/cmTestGenerator.cxx index d997596..b411f15 100644 --- a/Source/cmTestGenerator.cxx +++ b/Source/cmTestGenerator.cxx @@ -13,10 +13,8 @@ #include "cmGeneratorExpression.h" #include "cmOutputConverter.h" -#include "cmMakefile.h" #include "cmLocalGenerator.h" #include "cmSystemTools.h" -#include "cmTarget.h" #include "cmTest.h" //---------------------------------------------------------------------------- -- cgit v0.12 From 0554c2c970bf12dba01b408f3d8a103ede10a30b Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Fri, 23 Oct 2015 00:56:31 +0200 Subject: cmTarget: Fix style --- Source/cmTarget.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index e056469..a016e92 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -299,7 +299,8 @@ void cmTarget::AddUtility(const std::string& u, cmMakefile *makefile) { if(this->Utilities.insert(u).second && makefile) { - UtilityBacktraces.insert(std::make_pair(u, makefile->GetBacktrace())); + this->UtilityBacktraces.insert( + std::make_pair(u, makefile->GetBacktrace())); } } -- cgit v0.12 From e0213882222798eec587a4dbed6f28555d64b8d9 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Sun, 25 Oct 2015 15:09:41 +0100 Subject: cmTarget: Remove obsolete member --- Source/cmTarget.cxx | 4 ---- Source/cmTarget.h | 1 - 2 files changed, 5 deletions(-) diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index a016e92..da49048 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -61,7 +61,6 @@ cmTarget::cmTarget() this->HaveInstallRule = false; this->DLLPlatform = false; this->IsAndroid = false; - this->IsApple = false; this->IsImportedTarget = false; this->BuildInterfaceIncludesAppended = false; } @@ -98,9 +97,6 @@ void cmTarget::SetMakefile(cmMakefile* mf) strcmp(this->Makefile->GetSafeDefinition("CMAKE_SYSTEM_NAME"), "Android") == 0; - // Check whether we are targeting an Apple platform. - this->IsApple = this->Makefile->IsOn("APPLE"); - // Setup default property values. if (this->GetType() != cmState::INTERFACE_LIBRARY && this->GetType() != cmState::UTILITY) diff --git a/Source/cmTarget.h b/Source/cmTarget.h index 52ed578..f3a45d3 100644 --- a/Source/cmTarget.h +++ b/Source/cmTarget.h @@ -357,7 +357,6 @@ private: bool RecordDependencies; bool DLLPlatform; bool IsAndroid; - bool IsApple; bool IsImportedTarget; bool BuildInterfaceIncludesAppended; #if defined(_WIN32) && !defined(__CYGWIN__) -- cgit v0.12 From 91a829c165209b96c20d17f8eb7d46d3375cc57c Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Thu, 22 Oct 2015 01:12:38 +0200 Subject: Makefiles: Remove unused variable --- Source/cmLocalUnixMakefileGenerator3.cxx | 1 - 1 file changed, 1 deletion(-) diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index 27d631e..3972b41 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -173,7 +173,6 @@ void cmLocalUnixMakefileGenerator3::ComputeObjectFilenames( void cmLocalUnixMakefileGenerator3:: GetLocalObjectFiles(std::map &localObjectFiles) { - std::set emitted; std::vector targets = this->GetGeneratorTargets(); for(std::vector::iterator ti = targets.begin(); ti != targets.end(); ++ti) -- cgit v0.12 From 958508bb1fa8854cfe7bc4386fe83c82fed73e65 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Sun, 25 Oct 2015 15:04:07 +0100 Subject: cmMakefile: Fix style --- Source/cmMakefile.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 40e2892..0982da1 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -2207,7 +2207,7 @@ void cmMakefile::AddSourceGroup(const std::string& name, { std::vector nameVector; nameVector.push_back(name); - AddSourceGroup(nameVector, regex); + this->AddSourceGroup(nameVector, regex); } void cmMakefile::AddSourceGroup(const std::vector& name, -- cgit v0.12 From 13a37f5f76eb03e01e9ca225281531233ff0006c Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Sun, 25 Oct 2015 15:03:55 +0100 Subject: cmMakefile: Fix typo in comment --- Source/cmMakefile.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 0982da1..84ec4fb 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -2174,7 +2174,7 @@ cmMakefile::GetSourceGroup(const std::vector&name) const { cmSourceGroup* sg = 0; - // first look for source group starting with the same as the one we wants + // first look for source group starting with the same as the one we want for (std::vector::const_iterator sgIt = this->SourceGroups.begin(); sgIt != this->SourceGroups.end(); ++sgIt) -- cgit v0.12