summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Source/cmComputeLinkDepends.h1
-rw-r--r--Source/cmExportBuildFileGenerator.cxx1
-rw-r--r--Source/cmExtraKateGenerator.cxx1
-rw-r--r--Source/cmExtraKateGenerator.h2
-rw-r--r--Source/cmFunctionBlocker.h2
-rw-r--r--Source/cmGeneratorExpressionDAGChecker.cxx1
-rw-r--r--Source/cmGeneratorExpressionEvaluator.h6
-rw-r--r--Source/cmGeneratorExpressionNode.cxx1
-rw-r--r--Source/cmGeneratorExpressionNode.h2
-rw-r--r--Source/cmGeneratorExpressionParser.h2
-rw-r--r--Source/cmGlobalUnixMakefileGenerator3.cxx6
-rw-r--r--Source/cmGlobalUnixMakefileGenerator3.h2
-rw-r--r--Source/cmGlobalVisualStudioGenerator.cxx2
-rw-r--r--Source/cmInstallDirectoryGenerator.cxx1
-rw-r--r--Source/cmLocalNinjaGenerator.cxx2
-rw-r--r--Source/cmLocalUnixMakefileGenerator3.cxx21
-rw-r--r--Source/cmLocalVisualStudio10Generator.cxx1
-rw-r--r--Source/cmMakefile.cxx4
-rw-r--r--Source/cmTarget.cxx7
-rw-r--r--Source/cmTarget.h2
-rw-r--r--Source/cmTestGenerator.cxx2
-rw-r--r--Source/cmXCodeObject.h4
22 files changed, 25 insertions, 48 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/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index 9e36539..dcb2187 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<cmGeneratorTarget*> allTargets;
{
std::string expectedTargets;
std::string sep;
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 <cmsys/SystemTools.hxx>
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/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;
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 <vector>
-#include <string>
-
#include "cmListFileCache.h"
#include "cmGeneratorExpressionContext.h"
-class cmTarget;
+#include <vector>
+#include <string>
struct cmGeneratorExpressionDAGChecker;
struct cmGeneratorExpressionNode;
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index df6e3fb..32b2f82 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 7dd24fb..ce7815d 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"
@@ -158,8 +157,7 @@ void cmGlobalUnixMakefileGenerator3::Generate()
}
for(unsigned int i = 0; i < this->LocalGenerators.size(); ++i)
{
- cmLocalUnixMakefileGenerator3 *lg =
- static_cast<cmLocalUnixMakefileGenerator3 *>(this->LocalGenerators[i]);
+ cmLocalGenerator *lg = this->LocalGenerators[i];
std::string markFileName = lg->GetCurrentBinaryDirectory();
markFileName += "/";
markFileName += cmake::GetCMakeFilesDirectory();
@@ -982,7 +980,7 @@ cmGlobalUnixMakefileGenerator3
//----------------------------------------------------------------------------
size_t
cmGlobalUnixMakefileGenerator3
-::CountProgressMarksInAll(cmLocalUnixMakefileGenerator3* lg)
+::CountProgressMarksInAll(cmLocalGenerator* lg)
{
size_t count = 0;
std::set<cmGeneratorTarget const*> 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<cmGeneratorTarget const*>& emitted);
- size_t CountProgressMarksInAll(cmLocalUnixMakefileGenerator3* lg);
+ size_t CountProgressMarksInAll(cmLocalGenerator* lg);
cmGeneratedFileStream *CommandDatabase;
private:
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index bb0c974..6a1aa29 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -146,7 +146,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/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/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index 7de48a4..ecaa269 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 82e3b01..62fea3d 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 = "";
@@ -173,7 +173,6 @@ void cmLocalUnixMakefileGenerator3::ComputeObjectFilenames(
void cmLocalUnixMakefileGenerator3::
GetLocalObjectFiles(std::map<std::string, LocalObjectInfo> &localObjectFiles)
{
- std::set<std::string> emitted;
std::vector<cmGeneratorTarget*> targets = this->GetGeneratorTargets();
for(std::vector<cmGeneratorTarget*>::iterator ti = targets.begin();
ti != targets.end(); ++ti)
@@ -503,7 +502,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 +566,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 +1063,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 +1213,7 @@ cmLocalUnixMakefileGenerator3
const std::vector<std::string>& 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 +1492,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 +1566,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 +1827,7 @@ void cmLocalUnixMakefileGenerator3
std::vector<std::string> 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 +1871,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 +1889,7 @@ void cmLocalUnixMakefileGenerator3
depends, commands, true);
// Write the preinstall rule.
- recursiveTarget = this->Makefile->GetCurrentBinaryDirectory();
+ recursiveTarget = this->GetCurrentBinaryDirectory();
recursiveTarget += "/preinstall";
commands.clear();
depends.clear();
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/cmMakefile.cxx b/Source/cmMakefile.cxx
index ffe92af..4fb4579 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2172,7 +2172,7 @@ cmMakefile::GetSourceGroup(const std::vector<std::string>&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<cmSourceGroup>::const_iterator
sgIt = this->SourceGroups.begin();
sgIt != this->SourceGroups.end(); ++sgIt)
@@ -2205,7 +2205,7 @@ void cmMakefile::AddSourceGroup(const std::string& name,
{
std::vector<std::string> nameVector;
nameVector.push_back(name);
- AddSourceGroup(nameVector, regex);
+ this->AddSourceGroup(nameVector, regex);
}
void cmMakefile::AddSourceGroup(const std::vector<std::string>& name,
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 1eebd12..9ea1a34 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->ImportedGloballyVisible = false;
this->BuildInterfaceIncludesAppended = false;
@@ -99,9 +98,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)
@@ -300,7 +296,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()));
}
}
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 62e10f4..97b0871 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;
@@ -349,7 +348,6 @@ private:
bool RecordDependencies;
bool DLLPlatform;
bool IsAndroid;
- bool IsApple;
bool IsImportedTarget;
bool ImportedGloballyVisible;
bool BuildInterfaceIncludesAppended;
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"
//----------------------------------------------------------------------------
diff --git a/Source/cmXCodeObject.h b/Source/cmXCodeObject.h
index 0f0548b..bd0f43f 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<cmXCodeObject*> const&,
std::ostream& out);
@@ -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<cmXCodeObject*>::iterator i = this->List.begin();
generated by cgit v0.12 at 2024-11-13 22:07:47 (GMT)