diff options
| author | Brad King <brad.king@kitware.com> | 2015-08-31 13:48:30 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-08-31 13:48:30 (GMT) |
| commit | 9a6d7d2e5484fb75aa3aea2ad5d981cf699bfd25 (patch) | |
| tree | d04f50359dcb4a6328c12bd0bb99545b1c0bfabc /Source/cmLocalGenerator.cxx | |
| parent | 352e8e95b65e19cca10b4aec0c626787dfbb1ba1 (diff) | |
| parent | 616d8f02d53b9a0c2ec5c85a6b1afc17081d1e2e (diff) | |
| download | CMake-9a6d7d2e5484fb75aa3aea2ad5d981cf699bfd25.zip CMake-9a6d7d2e5484fb75aa3aea2ad5d981cf699bfd25.tar.gz CMake-9a6d7d2e5484fb75aa3aea2ad5d981cf699bfd25.tar.bz2 | |
Merge topic 'refactor-compute'
616d8f02 cmGeneratorTarget: Rename method to match operation.
ec56d244 cmGlobalGenerator: Process evaluation files after target depends.
1e5349a5 cmGlobalGenerator: Access makefile from makefiles container.
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 455b698..b360c22 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -447,7 +447,7 @@ void cmLocalGenerator::GenerateInstallRules() } //---------------------------------------------------------------------------- -void cmLocalGenerator::GenerateTargetManifest() +void cmLocalGenerator::ComputeTargetManifest() { // Collect the set of configuration types. std::vector<std::string> configNames; @@ -475,7 +475,7 @@ void cmLocalGenerator::GenerateTargetManifest() ci != configNames.end(); ++ci) { const char* config = ci->c_str(); - target.GenerateTargetManifest(config); + target.ComputeTargetManifest(config); } } } |