From 9db532f44dc014303e308e43b097175b8827508c Mon Sep 17 00:00:00 2001 From: Vitaly Stakhovsky Date: Mon, 20 Jan 2020 13:00:00 -0500 Subject: cmInstall*Generator: std::string params Several construction parameters converted to std::string Also made a few class members const --- Source/cmInstallFilesGenerator.cxx | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'Source/cmInstallFilesGenerator.cxx') diff --git a/Source/cmInstallFilesGenerator.cxx b/Source/cmInstallFilesGenerator.cxx index f5b69a5d48..e470ff8e76 100644 --- a/Source/cmInstallFilesGenerator.cxx +++ b/Source/cmInstallFilesGenerator.cxx @@ -2,6 +2,8 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmInstallFilesGenerator.h" +#include + #include "cmGeneratorExpression.h" #include "cmInstallType.h" #include "cmStringAlgorithms.h" @@ -9,16 +11,17 @@ class cmLocalGenerator; cmInstallFilesGenerator::cmInstallFilesGenerator( - std::vector const& files, const char* dest, bool programs, - const char* file_permissions, std::vector const& configurations, - const char* component, MessageLevel message, bool exclude_from_all, - const char* rename, bool optional) - : cmInstallGenerator(dest, configurations, component, message, - exclude_from_all) + std::vector const& files, std::string const& dest, + bool programs, std::string file_permissions, + std::vector const& configurations, std::string const& component, + MessageLevel message, bool exclude_from_all, std::string rename, + bool optional) + : cmInstallGenerator(dest.c_str(), configurations, component.c_str(), + message, exclude_from_all) , LocalGenerator(nullptr) , Files(files) - , FilePermissions(file_permissions) - , Rename(rename) + , FilePermissions(std::move(file_permissions)) + , Rename(std::move(rename)) , Programs(programs) , Optional(optional) { -- cgit v1.2.1