summaryrefslogtreecommitdiffstats
path: root/Source/cmLocalUnixMakefileGenerator3.h
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2009-06-25 13:58:51 (GMT)
committerBrad King <brad.king@kitware.com>2009-06-25 13:58:51 (GMT)
commitcd83f1979da5c2ed39e5824de70f2d84b8b1a4cc (patch)
tree4a19dcf2aa834fd8bfe4629dce874c17c4e05dca /Source/cmLocalUnixMakefileGenerator3.h
parentb9a98ef65b2c586d593219256a05a09c71216eee (diff)
downloadCMake-cd83f1979da5c2ed39e5824de70f2d84b8b1a4cc.zip
CMake-cd83f1979da5c2ed39e5824de70f2d84b8b1a4cc.tar.gz
CMake-cd83f1979da5c2ed39e5824de70f2d84b8b1a4cc.tar.bz2
ENH: Cleanup make progress rule generation code
This cleans up the Makefile generator's progress rule code. Instead of keeping every cmMakefileTargetGenerator instance alive to generate progress, we keep only the information necessary in a single table. This approach keeps most of the code in cmGlobalUnixMakefileGenerator3, thus simplifying its public interface.
Diffstat (limited to 'Source/cmLocalUnixMakefileGenerator3.h')
-rw-r--r--Source/cmLocalUnixMakefileGenerator3.h11
1 files changed, 0 insertions, 11 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.h b/Source/cmLocalUnixMakefileGenerator3.h
index 15fafa5..0bb0314 100644
--- a/Source/cmLocalUnixMakefileGenerator3.h
+++ b/Source/cmLocalUnixMakefileGenerator3.h
@@ -66,10 +66,6 @@ public:
// write the main variables used by the makefiles
void WriteMakeVariables(std::ostream& makefileStream);
- // write the progress variables used by the makefiles
- void WriteProgressVariables(unsigned long total, unsigned long &current);
- void WriteAllProgressVariable();
-
/**
* If true, then explicitly pass MAKEFLAGS on the make all target for makes
* that do not use environment variables.
@@ -256,10 +252,6 @@ public:
std::vector<cmStdString> const& GetLocalHelp() { return this->LocalHelp; }
- // return info about progress actions
- unsigned long GetNumberOfProgressActions();
- unsigned long GetNumberOfProgressActionsForTarget(const char *);
-
/** Get whether to create rules to generate preprocessed and
assembly sources. This could be converted to a variable lookup
later. */
@@ -340,8 +332,6 @@ protected:
const std::vector<std::string>& files,
cmTarget& target, const char* filename =0);
- std::map<cmStdString, std::vector<int> > ProgressFiles;
-
// Helper methods for dependeny updates.
bool ScanDependencies(const char* targetDir);
void CheckMultipleOutputs(bool verbose);
@@ -390,7 +380,6 @@ private:
std::vector<cmStdString> LocalHelp;
/* does the work for each target */
- std::vector<cmMakefileTargetGenerator *> TargetGenerators;
std::map<cmStdString, cmStdString> MakeVariableMap;
std::map<cmStdString, cmStdString> ShortMakeVariableMap;
};