From 30495bb1c291627f94912049da6e06d951a062ec Mon Sep 17 00:00:00 2001 From: Sebastian Holtermann Date: Sat, 23 Mar 2019 16:45:21 +0100 Subject: cmTarget: Move member `RuntimeInstallPath` to impl --- Source/cmInstallTargetsCommand.cxx | 2 +- Source/cmTarget.cxx | 11 +++++++++++ Source/cmTarget.h | 11 ++--------- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/Source/cmInstallTargetsCommand.cxx b/Source/cmInstallTargetsCommand.cxx index 8f417db..7e67d4e 100644 --- a/Source/cmInstallTargetsCommand.cxx +++ b/Source/cmInstallTargetsCommand.cxx @@ -41,7 +41,7 @@ bool cmInstallTargetsCommand::InitialPass(std::vector const& args, cmTargets::iterator ti = tgts.find(*s); if (ti != tgts.end()) { ti->second.SetInstallPath(args[0]); - ti->second.SetRuntimeInstallPath(runtime_dir.c_str()); + ti->second.SetRuntimeInstallPath(runtime_dir); ti->second.SetHaveInstallRule(true); } else { std::string str = "Cannot find target: \"" + *s + "\" to install."; diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index fa0e3e7..208655c 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -170,6 +170,7 @@ public: cmPolicies::PolicyMap PolicyMap; std::string Name; std::string InstallPath; + std::string RuntimeInstallPath; cmPropertyMap Properties; std::set> Utilities; std::set SystemIncludeDirectories; @@ -784,6 +785,16 @@ void cmTarget::SetInstallPath(std::string const& name) impl->InstallPath = name; } +std::string const& cmTarget::GetRuntimeInstallPath() const +{ + return impl->RuntimeInstallPath; +} + +void cmTarget::SetRuntimeInstallPath(std::string const& name) +{ + impl->RuntimeInstallPath = name; +} + cmTarget::LinkLibraryVectorType const& cmTarget::GetOriginalLinkLibraries() const { diff --git a/Source/cmTarget.h b/Source/cmTarget.h index 7dfedf1..b441df1 100644 --- a/Source/cmTarget.h +++ b/Source/cmTarget.h @@ -161,14 +161,8 @@ public: * Set the path where this target (if it has a runtime part) should be * installed. This is relative to INSTALL_PREFIX */ - std::string GetRuntimeInstallPath() const - { - return this->RuntimeInstallPath; - } - void SetRuntimeInstallPath(const char* name) - { - this->RuntimeInstallPath = name; - } + std::string const& GetRuntimeInstallPath() const; + void SetRuntimeInstallPath(std::string const& name); /** * Get/Set whether there is an install rule for this target. @@ -297,7 +291,6 @@ private: private: bool IsGeneratorProvided; - std::string RuntimeInstallPath; std::vector PreBuildCommands; std::vector PreLinkCommands; std::vector PostBuildCommands; -- cgit v0.12