diff options
author | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2020-01-20 18:00:00 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2020-01-21 14:19:13 (GMT) |
commit | 9db532f44dc014303e308e43b097175b8827508c (patch) | |
tree | e8dca2a118f40e4f9af1bbb70dfb984e428c3aad /Source/cmInstallDirectoryGenerator.cxx | |
parent | 941c09616bc214db77e3b1b7e5229517db08b45c (diff) | |
download | CMake-9db532f44dc014303e308e43b097175b8827508c.zip CMake-9db532f44dc014303e308e43b097175b8827508c.tar.gz CMake-9db532f44dc014303e308e43b097175b8827508c.tar.bz2 |
cmInstall*Generator: std::string params
Several construction parameters converted to std::string
Also made a few class members const
Diffstat (limited to 'Source/cmInstallDirectoryGenerator.cxx')
-rw-r--r-- | Source/cmInstallDirectoryGenerator.cxx | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/Source/cmInstallDirectoryGenerator.cxx b/Source/cmInstallDirectoryGenerator.cxx index 259c7f7..7e3148a 100644 --- a/Source/cmInstallDirectoryGenerator.cxx +++ b/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::vector<std::string> const& configurations, const char* component, - MessageLevel message, bool exclude_from_all, const char* literal_args, + std::string file_permissions, std::string dir_permissions, + std::vector<std::string> const& configurations, std::string const& component, + 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) - , DirPermissions(dir_permissions) - , LiteralArguments(literal_args) + , FilePermissions(std::move(file_permissions)) + , DirPermissions(std::move(dir_permissions)) + , LiteralArguments(std::move(literal_args)) , Optional(optional) { // We need per-config actions if destination have generator expressions. |