diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-08-25 06:25:12 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-08-30 09:39:52 (GMT) |
| commit | 616d8f02d53b9a0c2ec5c85a6b1afc17081d1e2e (patch) | |
| tree | 68531401f55d9eb65cfecdf411342b1134b1cc9c | |
| parent | ec56d244512ae87e4e3e1fcf01aa0ef80ead8763 (diff) | |
| download | CMake-616d8f02d53b9a0c2ec5c85a6b1afc17081d1e2e.zip CMake-616d8f02d53b9a0c2ec5c85a6b1afc17081d1e2e.tar.gz CMake-616d8f02d53b9a0c2ec5c85a6b1afc17081d1e2e.tar.bz2 | |
cmGeneratorTarget: Rename method to match operation.
The manifest is computed, not generated, according to current language
used in cmake method naming.
| -rw-r--r-- | Source/cmGeneratorTarget.cxx | 2 | ||||
| -rw-r--r-- | Source/cmGeneratorTarget.h | 2 | ||||
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 2 | ||||
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 4 | ||||
| -rw-r--r-- | Source/cmLocalGenerator.h | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index 4a1a7a2..09387b7 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -2554,7 +2554,7 @@ void cmGeneratorTarget::GetCompileDefinitions(std::vector<std::string> &list, } //---------------------------------------------------------------------------- -void cmGeneratorTarget::GenerateTargetManifest( +void cmGeneratorTarget::ComputeTargetManifest( const std::string& config) const { if (this->Target->IsImported()) diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h index 2c8467f..06d9a1f 100644 --- a/Source/cmGeneratorTarget.h +++ b/Source/cmGeneratorTarget.h @@ -251,7 +251,7 @@ public: const std::string& config) const; /** Add the target output files to the global generator manifest. */ - void GenerateTargetManifest(const std::string& config) const; + void ComputeTargetManifest(const std::string& config) const; /** * Trace through the source files in this target and add al source files diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index e6cbce3..a2885c0 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -1327,7 +1327,7 @@ void cmGlobalGenerator::Generate() // Compute the manifest of main targets generated. for (i = 0; i < this->LocalGenerators.size(); ++i) { - this->LocalGenerators[i]->GenerateTargetManifest(); + this->LocalGenerators[i]->ComputeTargetManifest(); } // Compute the inter-target dependencies. diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 7ce4819..f73e12f 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -450,7 +450,7 @@ void cmLocalGenerator::GenerateInstallRules() } //---------------------------------------------------------------------------- -void cmLocalGenerator::GenerateTargetManifest() +void cmLocalGenerator::ComputeTargetManifest() { // Collect the set of configuration types. std::vector<std::string> configNames; @@ -478,7 +478,7 @@ void cmLocalGenerator::GenerateTargetManifest() ci != configNames.end(); ++ci) { const char* config = ci->c_str(); - target.GenerateTargetManifest(config); + target.ComputeTargetManifest(config); } } } diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h index 915814b..2f0971e 100644 --- a/Source/cmLocalGenerator.h +++ b/Source/cmLocalGenerator.h @@ -67,7 +67,7 @@ public: /** * Generate a manifest of target files that will be built. */ - void GenerateTargetManifest(); + void ComputeTargetManifest(); ///! Get the makefile for this generator cmMakefile *GetMakefile() { |