cmInstall*Generator: std::string params

Several construction parameters converted to std::string
Also made a few class members const

Source/cmInstallCommand.cxx

@@ -93,13 +93,12 @@ std::unique_ptr<cmInstallTargetGenerator> CreateInstallTargetGenerator(
   cmInstallGenerator::MessageLevel message =
     cmInstallGenerator::SelectMessageLevel(target.GetMakefile());
   target.SetHaveInstallRule(true);
-  const char* component = namelink ? args.GetNamelinkComponent().c_str()
+  const std::string& component =
-                                   : args.GetComponent().c_str();
+    namelink ? args.GetNamelinkComponent() : args.GetComponent();
   auto g = cm::make_unique<cmInstallTargetGenerator>(
-    target.GetName(), destination.c_str(), impLib,
+    target.GetName(), destination, impLib, args.GetPermissions(),
-    args.GetPermissions().c_str(), args.GetConfigurations(), component,
+    args.GetConfigurations(), component, message, args.GetExcludeFromAll(),
-    message, args.GetExcludeFromAll(), args.GetOptional() || forceOpt,
+    args.GetOptional() || forceOpt, backtrace);
-    backtrace);
   target.AddInstallGenerator(g.get());
   return g;
 }
@@ -122,9 +121,9 @@ std::unique_ptr<cmInstallFilesGenerator> CreateInstallFilesGenerator(
   cmInstallGenerator::MessageLevel message =
     cmInstallGenerator::SelectMessageLevel(mf);
   return cm::make_unique<cmInstallFilesGenerator>(
-    absFiles, destination.c_str(), programs, args.GetPermissions().c_str(),
+    absFiles, destination, programs, args.GetPermissions(),
-    args.GetConfigurations(), args.GetComponent().c_str(), message,
+    args.GetConfigurations(), args.GetComponent(), message,
-    args.GetExcludeFromAll(), args.GetRename().c_str(), args.GetOptional());
+    args.GetExcludeFromAll(), args.GetRename(), args.GetOptional());
 }
 
 std::unique_ptr<cmInstallFilesGenerator> CreateInstallFilesGenerator(
@@ -198,13 +197,13 @@ bool HandleScriptMode(std::vector<std::string> const& args,
       }
       helper.Makefile->AddInstallGenerator(
         cm::make_unique<cmInstallScriptGenerator>(
-          script.c_str(), false, component.c_str(), exclude_from_all));
+          script, false, component.c_str(), exclude_from_all));
     } else if (doing_code) {
       doing_code = false;
       std::string const& code = arg;
       helper.Makefile->AddInstallGenerator(
         cm::make_unique<cmInstallScriptGenerator>(
-          code.c_str(), true, component.c_str(), exclude_from_all));
+          code, true, component.c_str(), exclude_from_all));
     }
   }
 
@@ -1202,9 +1201,8 @@ bool HandleDirectoryMode(std::vector<std::string> const& args,
   // Create the directory install generator.
   helper.Makefile->AddInstallGenerator(
     cm::make_unique<cmInstallDirectoryGenerator>(
-      dirs, destination, permissions_file.c_str(), permissions_dir.c_str(),
+      dirs, destination, permissions_file, permissions_dir, configurations,
-      configurations, component.c_str(), message, exclude_from_all,
+      component, message, exclude_from_all, literal_args, optional));
-      literal_args.c_str(), optional));
 
   // Tell the global generator about any installation component names
   // specified.
@@ -1294,10 +1292,9 @@ bool HandleExportAndroidMKMode(std::vector<std::string> const& args,
   // Create the export install generator.
   helper.Makefile->AddInstallGenerator(
     cm::make_unique<cmInstallExportGenerator>(
-      &exportSet, ica.GetDestination().c_str(), ica.GetPermissions().c_str(),
+      &exportSet, ica.GetDestination(), ica.GetPermissions(),
-      ica.GetConfigurations(), ica.GetComponent().c_str(), message,
+      ica.GetConfigurations(), ica.GetComponent(), message,
-      ica.GetExcludeFromAll(), fname.c_str(), name_space.c_str(), exportOld,
+      ica.GetExcludeFromAll(), fname, name_space, exportOld, true));
-      true));
 
   return true;
 #else
@@ -1408,10 +1405,9 @@ bool HandleExportMode(std::vector<std::string> const& args,
   // Create the export install generator.
   helper.Makefile->AddInstallGenerator(
     cm::make_unique<cmInstallExportGenerator>(
-      &exportSet, ica.GetDestination().c_str(), ica.GetPermissions().c_str(),
+      &exportSet, ica.GetDestination(), ica.GetPermissions(),
-      ica.GetConfigurations(), ica.GetComponent().c_str(), message,
+      ica.GetConfigurations(), ica.GetComponent(), message,
-      ica.GetExcludeFromAll(), fname.c_str(), name_space.c_str(), exportOld,
+      ica.GetExcludeFromAll(), fname, name_space, exportOld, false));
-      false));
 
   return true;
 }

Source/cmInstallDirectoryGenerator.cxx

@@ -2,6 +2,8 @@
    file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmInstallDirectoryGenerator.h"
 
+#include <utility>
+
 #include "cmGeneratorExpression.h"
 #include "cmInstallType.h"
 #include "cmLocalGenerator.h"
@@ -11,17 +13,17 @@
 
 cmInstallDirectoryGenerator::cmInstallDirectoryGenerator(
   std::vector<std::string> const& dirs, const char* dest,
-  const char* file_permissions, const char* dir_permissions,
+  std::string file_permissions, std::string dir_permissions,
-  std::vector<std::string> const& configurations, const char* component,
+  std::vector<std::string> const& configurations, std::string const& component,
-  MessageLevel message, bool exclude_from_all, const char* literal_args,
+  MessageLevel message, bool exclude_from_all, std::string literal_args,
   bool optional)
-  : cmInstallGenerator(dest, configurations, component, message,
+  : cmInstallGenerator(dest, configurations, component.c_str(), message,
                        exclude_from_all)
   , LocalGenerator(nullptr)
   , Directories(dirs)
-  , FilePermissions(file_permissions)
+  , FilePermissions(std::move(file_permissions))
-  , DirPermissions(dir_permissions)
+  , DirPermissions(std::move(dir_permissions))
-  , LiteralArguments(literal_args)
+  , LiteralArguments(std::move(literal_args))
   , Optional(optional)
 {
   // We need per-config actions if destination have generator expressions.

Source/cmInstallDirectoryGenerator.h

@@ -21,12 +21,12 @@ class cmInstallDirectoryGenerator : public cmInstallGenerator
 {
 public:
   cmInstallDirectoryGenerator(std::vector<std::string> const& dirs,
-                              const char* dest, const char* file_permissions,
+                              const char* dest, std::string file_permissions,
-                              const char* dir_permissions,
+                              std::string dir_permissions,
                               std::vector<std::string> const& configurations,
-                              const char* component, MessageLevel message,
+                              std::string const& component,
-                              bool exclude_from_all, const char* literal_args,
+                              MessageLevel message, bool exclude_from_all,
-                              bool optional = false);
+                              std::string literal_args, bool optional = false);
   ~cmInstallDirectoryGenerator() override;
 
   bool Compute(cmLocalGenerator* lg) override;
@@ -41,11 +41,11 @@ protected:
                                Indent indent,
                                std::vector<std::string> const& dirs);
   cmLocalGenerator* LocalGenerator;
-  std::vector<std::string> Directories;
+  std::vector<std::string> const Directories;
-  std::string FilePermissions;
+  std::string const FilePermissions;
-  std::string DirPermissions;
+  std::string const DirPermissions;
-  std::string LiteralArguments;
+  std::string const LiteralArguments;
-  bool Optional;
+  bool const Optional;
 };
 
 #endif

Source/cmInstallExportGenerator.cxx

@@ -18,16 +18,16 @@
 #include "cmSystemTools.h"
 
 cmInstallExportGenerator::cmInstallExportGenerator(
-  cmExportSet* exportSet, const char* destination,
+  cmExportSet* exportSet, std::string const& destination,
-  const char* file_permissions, std::vector<std::string> const& configurations,
+  std::string file_permissions, std::vector<std::string> const& configurations,
-  const char* component, MessageLevel message, bool exclude_from_all,
+  std::string const& component, MessageLevel message, bool exclude_from_all,
-  const char* filename, const char* name_space, bool exportOld, bool android)
+  std::string filename, std::string name_space, bool exportOld, bool android)
-  : cmInstallGenerator(destination, configurations, component, message,
+  : cmInstallGenerator(destination.c_str(), configurations, component.c_str(),
-                       exclude_from_all)
+                       message, exclude_from_all)
   , ExportSet(exportSet)
-  , FilePermissions(file_permissions)
+  , FilePermissions(std::move(file_permissions))
-  , FileName(filename)
+  , FileName(std::move(filename))
-  , Namespace(name_space)
+  , Namespace(std::move(name_space))
   , ExportOld(exportOld)
   , LocalGenerator(nullptr)
 {

Source/cmInstallExportGenerator.h

@@ -23,12 +23,12 @@ class cmLocalGenerator;
 class cmInstallExportGenerator : public cmInstallGenerator
 {
 public:
-  cmInstallExportGenerator(cmExportSet* exportSet, const char* dest,
+  cmInstallExportGenerator(cmExportSet* exportSet, std::string const& dest,
-                           const char* file_permissions,
+                           std::string file_permissions,
                            const std::vector<std::string>& configurations,
-                           const char* component, MessageLevel message,
+                           std::string const& component, MessageLevel message,
-                           bool exclude_from_all, const char* filename,
+                           bool exclude_from_all, std::string filename,
-                           const char* name_space, bool exportOld,
+                           std::string name_space, bool exportOld,
                            bool android);
   ~cmInstallExportGenerator() override;
 
@@ -52,11 +52,11 @@ protected:
   void ComputeTempDir();
   size_t GetMaxConfigLength() const;
 
-  cmExportSet* ExportSet;
+  cmExportSet* const ExportSet;
-  std::string FilePermissions;
+  std::string const FilePermissions;
-  std::string FileName;
+  std::string const FileName;
-  std::string Namespace;
+  std::string const Namespace;
-  bool ExportOld;
+  bool const ExportOld;
   cmLocalGenerator* LocalGenerator;
 
   std::string TempDir;

Source/cmInstallFilesCommand.cxx

@@ -115,8 +115,8 @@ static void CreateInstallGenerator(cmMakefile& makefile,
   }
 
   // Use a file install generator.
-  const char* no_permissions = "";
+  const std::string no_permissions;
-  const char* no_rename = "";
+  const std::string no_rename;
   bool no_exclude_from_all = false;
   std::string no_component =
     makefile.GetSafeDefinition("CMAKE_INSTALL_DEFAULT_COMPONENT_NAME");
@@ -124,8 +124,8 @@ static void CreateInstallGenerator(cmMakefile& makefile,
   cmInstallGenerator::MessageLevel message =
     cmInstallGenerator::SelectMessageLevel(&makefile);
   makefile.AddInstallGenerator(cm::make_unique<cmInstallFilesGenerator>(
-    files, destination.c_str(), false, no_permissions, no_configurations,
+    files, destination, false, no_permissions, no_configurations, no_component,
-    no_component.c_str(), message, no_exclude_from_all, no_rename));
+    message, no_exclude_from_all, no_rename));
 }
 
 /**

Source/cmInstallFilesGenerator.cxx

@@ -2,6 +2,8 @@
    file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmInstallFilesGenerator.h"
 
+#include <utility>
+
 #include "cmGeneratorExpression.h"
 #include "cmInstallType.h"
 #include "cmStringAlgorithms.h"
@@ -9,16 +11,17 @@
 class cmLocalGenerator;
 
 cmInstallFilesGenerator::cmInstallFilesGenerator(
-  std::vector<std::string> const& files, const char* dest, bool programs,
+  std::vector<std::string> const& files, std::string const& dest,
-  const char* file_permissions, std::vector<std::string> const& configurations,
+  bool programs, std::string file_permissions,
-  const char* component, MessageLevel message, bool exclude_from_all,
+  std::vector<std::string> const& configurations, std::string const& component,
-  const char* rename, bool optional)
+  MessageLevel message, bool exclude_from_all, std::string rename,
-  : cmInstallGenerator(dest, configurations, component, message,
+  bool optional)
-                       exclude_from_all)
+  : cmInstallGenerator(dest.c_str(), configurations, component.c_str(),
+                       message, exclude_from_all)
   , LocalGenerator(nullptr)
   , Files(files)
-  , FilePermissions(file_permissions)
+  , FilePermissions(std::move(file_permissions))
-  , Rename(rename)
+  , Rename(std::move(rename))
   , Programs(programs)
   , Optional(optional)
 {

Source/cmInstallFilesGenerator.h

@@ -21,11 +21,11 @@ class cmInstallFilesGenerator : public cmInstallGenerator
 {
 public:
   cmInstallFilesGenerator(std::vector<std::string> const& files,
-                          const char* dest, bool programs,
+                          std::string const& dest, bool programs,
-                          const char* file_permissions,
+                          std::string file_permissions,
                           std::vector<std::string> const& configurations,
-                          const char* component, MessageLevel message,
+                          std::string const& component, MessageLevel message,
-                          bool exclude_from_all, const char* rename,
+                          bool exclude_from_all, std::string rename,
                           bool optional = false);
   ~cmInstallFilesGenerator() override;
 
@@ -42,11 +42,11 @@ protected:
                            std::vector<std::string> const& files);
 
   cmLocalGenerator* LocalGenerator;
-  std::vector<std::string> Files;
+  std::vector<std::string> const Files;
-  std::string FilePermissions;
+  std::string const FilePermissions;
-  std::string Rename;
+  std::string const Rename;
-  bool Programs;
+  bool const Programs;
-  bool Optional;
+  bool const Optional;
 };
 
 #endif

Source/cmInstallProgramsCommand.cxx

@@ -89,8 +89,8 @@ static void FinalAction(cmMakefile& makefile, std::string const& dest,
   }
 
   // Use a file install generator.
-  const char* no_permissions = "";
+  const std::string no_permissions;
-  const char* no_rename = "";
+  const std::string no_rename;
   bool no_exclude_from_all = false;
   std::string no_component =
     makefile.GetSafeDefinition("CMAKE_INSTALL_DEFAULT_COMPONENT_NAME");
@@ -98,8 +98,8 @@ static void FinalAction(cmMakefile& makefile, std::string const& dest,
   cmInstallGenerator::MessageLevel message =
     cmInstallGenerator::SelectMessageLevel(&makefile);
   makefile.AddInstallGenerator(cm::make_unique<cmInstallFilesGenerator>(
-    files, destination.c_str(), true, no_permissions, no_configurations,
+    files, destination, true, no_permissions, no_configurations, no_component,
-    no_component.c_str(), message, no_exclude_from_all, no_rename));
+    message, no_exclude_from_all, no_rename));
 }
 
 /**

Source/cmInstallScriptGenerator.cxx

@@ -3,6 +3,7 @@
 #include "cmInstallScriptGenerator.h"
 
 #include <ostream>
+#include <utility>
 #include <vector>
 
 #include "cmGeneratorExpression.h"
@@ -11,13 +12,13 @@
 #include "cmPolicies.h"
 #include "cmScriptGenerator.h"
 
-cmInstallScriptGenerator::cmInstallScriptGenerator(const char* script,
+cmInstallScriptGenerator::cmInstallScriptGenerator(std::string script,
                                                    bool code,
                                                    const char* component,
                                                    bool exclude_from_all)
   : cmInstallGenerator(nullptr, std::vector<std::string>(), component,
                        MessageDefault, exclude_from_all)
-  , Script(script)
+  , Script(std::move(script))
   , Code(code)
   , AllowGenex(false)
 {

Source/cmInstallScriptGenerator.h

@@ -19,7 +19,7 @@ class cmLocalGenerator;
 class cmInstallScriptGenerator : public cmInstallGenerator
 {
 public:
-  cmInstallScriptGenerator(const char* script, bool code,
+  cmInstallScriptGenerator(std::string script, bool code,
                            const char* component, bool exclude_from_all);
   ~cmInstallScriptGenerator() override;
 
@@ -32,8 +32,8 @@ protected:
   void AddScriptInstallRule(std::ostream& os, Indent indent,
                             std::string const& script);
 
-  std::string Script;
+  std::string const Script;
-  bool Code;
+  bool const Code;
   cmLocalGenerator* LocalGenerator;
   bool AllowGenex;
 };

Source/cmInstallSubdirectoryGenerator.cxx

@@ -4,6 +4,7 @@
 
 #include <memory>
 #include <sstream>
+#include <utility>
 #include <vector>
 
 #include "cmLocalGenerator.h"
@@ -13,11 +14,11 @@
 #include "cmSystemTools.h"
 
 cmInstallSubdirectoryGenerator::cmInstallSubdirectoryGenerator(
-  cmMakefile* makefile, const char* binaryDirectory, bool excludeFromAll)
+  cmMakefile* makefile, std::string binaryDirectory, bool excludeFromAll)
   : cmInstallGenerator(nullptr, std::vector<std::string>(), nullptr,
                        MessageDefault, excludeFromAll)
   , Makefile(makefile)
-  , BinaryDirectory(binaryDirectory)
+  , BinaryDirectory(std::move(binaryDirectory))
 {
 }
 

Source/cmInstallSubdirectoryGenerator.h

@@ -20,7 +20,7 @@ class cmInstallSubdirectoryGenerator : public cmInstallGenerator
 {
 public:
   cmInstallSubdirectoryGenerator(cmMakefile* makefile,
-                                 const char* binaryDirectory,
+                                 std::string binaryDirectory,
                                  bool excludeFromAll);
   ~cmInstallSubdirectoryGenerator() override;
 
@@ -33,8 +33,8 @@ public:
 protected:
   void GenerateScript(std::ostream& os) override;
 
-  cmMakefile* Makefile;
+  cmMakefile* const Makefile;
-  std::string BinaryDirectory;
+  std::string const BinaryDirectory;
   cmLocalGenerator* LocalGenerator;
 };
 

Source/cmInstallTargetGenerator.cxx

@@ -25,15 +25,15 @@
 #include "cmake.h"
 
 cmInstallTargetGenerator::cmInstallTargetGenerator(
-  std::string targetName, const char* dest, bool implib,
+  std::string targetName, std::string const& dest, bool implib,
-  const char* file_permissions, std::vector<std::string> const& configurations,
+  std::string file_permissions, std::vector<std::string> const& configurations,
-  const char* component, MessageLevel message, bool exclude_from_all,
+  std::string const& component, MessageLevel message, bool exclude_from_all,
   bool optional, cmListFileBacktrace backtrace)
-  : cmInstallGenerator(dest, configurations, component, message,
+  : cmInstallGenerator(dest.c_str(), configurations, component.c_str(),
-                       exclude_from_all)
+                       message, exclude_from_all)
   , TargetName(std::move(targetName))
   , Target(nullptr)
-  , FilePermissions(file_permissions)
+  , FilePermissions(std::move(file_permissions))
   , ImportLibrary(implib)
   , Optional(optional)
   , Backtrace(std::move(backtrace))

Source/cmInstallTargetGenerator.h

@@ -23,11 +23,11 @@ class cmInstallTargetGenerator : public cmInstallGenerator
 {
 public:
   cmInstallTargetGenerator(
-    std::string targetName, const char* dest, bool implib,
+    std::string targetName, std::string const& dest, bool implib,
-    const char* file_permissions,
+    std::string file_permissions,
-    std::vector<std::string> const& configurations, const char* component,
+    std::vector<std::string> const& configurations,
-    MessageLevel message, bool exclude_from_all, bool optional,
+    std::string const& component, MessageLevel message, bool exclude_from_all,
-    cmListFileBacktrace backtrace = cmListFileBacktrace());
+    bool optional, cmListFileBacktrace backtrace = cmListFileBacktrace());
   ~cmInstallTargetGenerator() override;
 
   /** Select the policy for installing shared library linkable name
@@ -106,13 +106,13 @@ protected:
                                const std::string& toDestDirPath);
   void IssueCMP0095Warning(const std::string& unescapedRpath);
 
-  std::string TargetName;
+  std::string const TargetName;
   cmGeneratorTarget* Target;
-  std::string FilePermissions;
+  std::string const FilePermissions;
   NamelinkModeType NamelinkMode;
-  bool ImportLibrary;
+  bool const ImportLibrary;
-  bool Optional;
+  bool const Optional;
-  cmListFileBacktrace Backtrace;
+  cmListFileBacktrace const Backtrace;
 };
 
 #endif

Source/cmLocalGenerator.cxx

@@ -3004,7 +3004,7 @@ class cmInstallTargetGeneratorLocal : public cmInstallTargetGenerator
 {
 public:
   cmInstallTargetGeneratorLocal(cmLocalGenerator* lg, std::string const& t,
-                                const char* dest, bool implib)
+                                std::string const& dest, bool implib)
     : cmInstallTargetGenerator(
         t, dest, implib, "", std::vector<std::string>(), "Unspecified",
         cmInstallGenerator::SelectMessageLevel(lg->GetMakefile()), false,
@@ -3049,8 +3049,8 @@ void cmLocalGenerator::GenerateTargetInstallRules(
         case cmStateEnums::STATIC_LIBRARY:
         case cmStateEnums::MODULE_LIBRARY: {
           // Use a target install generator.
-          cmInstallTargetGeneratorLocal g(this, l->GetName(),
+          cmInstallTargetGeneratorLocal g(this, l->GetName(), destination,
-                                          destination.c_str(), false);
+                                          false);
           g.Generate(os, config, configurationTypes);
         } break;
         case cmStateEnums::SHARED_LIBRARY: {
@@ -3058,19 +3058,19 @@ void cmLocalGenerator::GenerateTargetInstallRules(
           // Special code to handle DLL.  Install the import library
           // to the normal destination and the DLL to the runtime
           // destination.
-          cmInstallTargetGeneratorLocal g1(this, l->GetName(),
+          cmInstallTargetGeneratorLocal g1(this, l->GetName(), destination,
-                                           destination.c_str(), true);
+                                           true);
           g1.Generate(os, config, configurationTypes);
           // We also skip over the leading slash given by the user.
           destination = l->Target->GetRuntimeInstallPath().substr(1);
           cmSystemTools::ConvertToUnixSlashes(destination);
-          cmInstallTargetGeneratorLocal g2(this, l->GetName(),
+          cmInstallTargetGeneratorLocal g2(this, l->GetName(), destination,
-                                           destination.c_str(), false);
+                                           false);
           g2.Generate(os, config, configurationTypes);
 #else
           // Use a target install generator.
-          cmInstallTargetGeneratorLocal g(this, l->GetName(),
+          cmInstallTargetGeneratorLocal g(this, l->GetName(), destination,
-                                          destination.c_str(), false);
+                                          false);
           g.Generate(os, config, configurationTypes);
 #endif
         } break;

Source/cmMakefile.cxx

@@ -1748,7 +1748,7 @@ void cmMakefile::AddSubDirectory(const std::string& srcPath,
   }
 
   this->AddInstallGenerator(cm::make_unique<cmInstallSubdirectoryGenerator>(
-    subMf, binPath.c_str(), excludeFromAll));
+    subMf, binPath, excludeFromAll));
 }
 
 const std::string& cmMakefile::GetCurrentSourceDirectory() const