This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via 0e69f517951fefc4f4917d3101259c8a7a7fbc66 (commit) via 75ace0a67d0b57eecaf1862e8a5dc68efa0a724b (commit) from d1f0e3064827cbaa929e8d55ae69ec40fda43a45 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0e69f517951fefc4f4917d3101259c8a7a7fbc66 commit 0e69f517951fefc4f4917d3101259c8a7a7fbc66 Merge: d1f0e30 75ace0a Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Sun Oct 16 07:54:59 2016 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Sun Oct 16 07:54:59 2016 -0400 Merge topic 'extract-computed-target-properties' into next 75ace0a6 fixup! cmTarget: Move sanity checks and computed property access to callers https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=75ace0a67d0b57eecaf1862e8a5dc68efa0a724b commit 75ace0a67d0b57eecaf1862e8a5dc68efa0a724b Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Sun Oct 16 13:54:29 2016 +0200 Commit: Stephen Kelly <steve...@gmail.com> CommitDate: Sun Oct 16 13:54:29 2016 +0200 fixup! cmTarget: Move sanity checks and computed property access to callers diff --git a/Source/cmGetPropertyCommand.cxx b/Source/cmGetPropertyCommand.cxx index 0a59933..39445dd 100644 --- a/Source/cmGetPropertyCommand.cxx +++ b/Source/cmGetPropertyCommand.cxx @@ -10,16 +10,6 @@ #include "cmTest.h" #include "cmake.h" -#ifdef __clang__ -extern template const char* cmTargetPropertyComputer::ComputeLocationForBuild( - cmTarget const* tgt); -extern template const char* cmTargetPropertyComputer::ComputeLocation( - cmTarget const* tgt, std::string const& config); -extern template const char* cmTargetPropertyComputer::GetSources( - cmTarget const* tgt, cmMessenger* messenger, - cmListFileBacktrace const& context); -#endif - cmGetPropertyCommand::cmGetPropertyCommand() { this->InfoType = OutValue; @@ -262,8 +252,8 @@ bool cmGetPropertyCommand::HandleTargetMode() cmMessenger* messenger = this->Makefile->GetMessenger(); if (cmTargetPropertyComputer::PassesWhitelist( target->GetType(), this->PropertyName, messenger, bt)) { - prop_cstr = cmTargetPropertyComputer::GetProperty( - target, this->PropertyName, messenger, bt); + prop_cstr = + target->GetComputedProperty(this->PropertyName, messenger, bt); if (!prop_cstr) { prop_cstr = target->GetProperty(this->PropertyName); } diff --git a/Source/cmGetTargetPropertyCommand.cxx b/Source/cmGetTargetPropertyCommand.cxx index d009bc3..6a816d8 100644 --- a/Source/cmGetTargetPropertyCommand.cxx +++ b/Source/cmGetTargetPropertyCommand.cxx @@ -4,16 +4,6 @@ #include "cmTargetPropertyComputer.h" -#ifdef __clang__ -extern template const char* cmTargetPropertyComputer::ComputeLocationForBuild( - cmTarget const* tgt); -extern template const char* cmTargetPropertyComputer::ComputeLocation( - cmTarget const* tgt, std::string const& config); -extern template const char* cmTargetPropertyComputer::GetSources( - cmTarget const* tgt, cmMessenger* messenger, - cmListFileBacktrace const& context); -#endif - // cmSetTargetPropertyCommand bool cmGetTargetPropertyCommand::InitialPass( std::vector<std::string> const& args, cmExecutionStatus&) @@ -39,8 +29,7 @@ bool cmGetTargetPropertyCommand::InitialPass( cmMessenger* messenger = this->Makefile->GetMessenger(); if (cmTargetPropertyComputer::PassesWhitelist(tgt->GetType(), args[2], messenger, bt)) { - prop_cstr = - cmTargetPropertyComputer::GetProperty(tgt, args[2], messenger, bt); + prop_cstr = tgt->GetComputedProperty(args[2], messenger, bt); if (!prop_cstr) { prop_cstr = tgt->GetProperty(args[2]); } diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index b2b7cd6..3a22309 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -1129,6 +1129,13 @@ void cmTarget::CheckProperty(const std::string& prop, } } +const char* cmTarget::GetComputedProperty( + const std::string& prop, cmMessenger* messenger, + cmListFileBacktrace const& context) const +{ + return cmTargetPropertyComputer::GetProperty(this, prop, messenger, context); +} + const char* cmTarget::GetProperty(const std::string& prop) const { static UNORDERED_SET<std::string> specialProps; diff --git a/Source/cmTarget.h b/Source/cmTarget.h index d48e7e2..bd00b3d 100644 --- a/Source/cmTarget.h +++ b/Source/cmTarget.h @@ -202,6 +202,9 @@ public: const char* GetProperty(const std::string& prop) const; bool GetPropertyAsBool(const std::string& prop) const; void CheckProperty(const std::string& prop, cmMakefile* context) const; + const char* GetComputedProperty(const std::string& prop, + cmMessenger* messenger, + cmListFileBacktrace const& context) const; bool IsImported() const { return this->IsImportedTarget; } bool IsImportedGloballyVisible() const ----------------------------------------------------------------------- Summary of changes: Source/cmGetPropertyCommand.cxx | 14 ++------------ Source/cmGetTargetPropertyCommand.cxx | 13 +------------ Source/cmTarget.cxx | 7 +++++++ Source/cmTarget.h | 3 +++ 4 files changed, 13 insertions(+), 24 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits