Преглед изворни кода

cmTarget: Move member `RuntimeInstallPath` to impl

Sebastian Holtermann пре 6 година
родитељ
комит
30495bb1c2
3 измењених фајлова са 14 додато и 10 уклоњено
  1. 1 1
      Source/cmInstallTargetsCommand.cxx
  2. 11 0
      Source/cmTarget.cxx
  3. 2 9
      Source/cmTarget.h

+ 1 - 1
Source/cmInstallTargetsCommand.cxx

@@ -41,7 +41,7 @@ bool cmInstallTargetsCommand::InitialPass(std::vector<std::string> 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.";

+ 11 - 0
Source/cmTarget.cxx

@@ -170,6 +170,7 @@ public:
   cmPolicies::PolicyMap PolicyMap;
   std::string Name;
   std::string InstallPath;
+  std::string RuntimeInstallPath;
   cmPropertyMap Properties;
   std::set<BT<std::string>> Utilities;
   std::set<std::string> 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
 {

+ 2 - 9
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<cmCustomCommand> PreBuildCommands;
   std::vector<cmCustomCommand> PreLinkCommands;
   std::vector<cmCustomCommand> PostBuildCommands;