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/cmGeneratorTarget.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/cmGeneratorTarget.cxx')
-rw-r--r-- | Source/cmGeneratorTarget.cxx | 2 |
1 files changed, 1 insertions, 1 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()) |