diff options
| author | Brad King <brad.king@kitware.com> | 2020-01-21 14:21:42 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-01-21 14:21:51 (GMT) |
| commit | 7a89e3c36cf919bf7c608456bcfd5d12978dc037 (patch) | |
| tree | 0fec84a7585f1aa513fde6afa8eade6b66084fed /Source/cmInstallTargetGenerator.cxx | |
| parent | 7d17ec2a2e840df17b0d5a647b850984e6ab5f38 (diff) | |
| parent | 9db532f44dc014303e308e43b097175b8827508c (diff) | |
| download | CMake-7a89e3c36cf919bf7c608456bcfd5d12978dc037.zip CMake-7a89e3c36cf919bf7c608456bcfd5d12978dc037.tar.gz CMake-7a89e3c36cf919bf7c608456bcfd5d12978dc037.tar.bz2 | |
Merge topic 'install-std-string'
9db532f44d cmInstall*Generator: std::string params
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4241
Diffstat (limited to 'Source/cmInstallTargetGenerator.cxx')
| -rw-r--r-- | Source/cmInstallTargetGenerator.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx index 69c9b7e..d2fc2ea 100644 --- a/Source/cmInstallTargetGenerator.cxx +++ b/Source/cmInstallTargetGenerator.cxx @@ -25,15 +25,15 @@ #include "cmake.h" cmInstallTargetGenerator::cmInstallTargetGenerator( - std::string targetName, const char* dest, bool implib, - const char* file_permissions, std::vector<std::string> const& configurations, - const char* component, MessageLevel message, bool exclude_from_all, + std::string targetName, std::string const& dest, bool implib, + std::string file_permissions, std::vector<std::string> const& configurations, + std::string const& component, MessageLevel message, bool exclude_from_all, bool optional, cmListFileBacktrace backtrace) - : cmInstallGenerator(dest, configurations, component, message, - exclude_from_all) + : cmInstallGenerator(dest.c_str(), configurations, component.c_str(), + 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)) |