diff options
author | Brad King <brad.king@kitware.com> | 2019-02-25 12:59:51 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2019-02-25 12:59:59 (GMT) |
commit | 0476d16589cf62bc631acc2f50ff2a0525b6d641 (patch) | |
tree | 217b45e0071c8f00983eebf5f9df52646dd571c8 /Source/CPack/cmCPackGenerator.cxx | |
parent | ae309d757dfb4f654360f5412b86243e54cc387a (diff) | |
parent | 4e315e9449735fc0f246c8cc838613693e849296 (diff) | |
download | CMake-0476d16589cf62bc631acc2f50ff2a0525b6d641.zip CMake-0476d16589cf62bc631acc2f50ff2a0525b6d641.tar.gz CMake-0476d16589cf62bc631acc2f50ff2a0525b6d641.tar.bz2 |
Merge topic 'systools-stdstring3'
4e315e9449 cmSystemTools: More functions accept `std::string` params
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2999
Diffstat (limited to 'Source/CPack/cmCPackGenerator.cxx')
-rw-r--r-- | Source/CPack/cmCPackGenerator.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index 575254e..127bcf9 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -1255,9 +1255,8 @@ bool cmCPackGenerator::ConfigureFile(const std::string& inName, int cmCPackGenerator::CleanTemporaryDirectory() { - std::string tempInstallDirectoryWithPostfix = + std::string tempInstallDirectory = this->GetOption("CPACK_TEMPORARY_INSTALL_DIRECTORY"); - const char* tempInstallDirectory = tempInstallDirectoryWithPostfix.c_str(); if (cmsys::SystemTools::FileExists(tempInstallDirectory)) { cmCPackLogger(cmCPackLog::LOG_OUTPUT, "- Clean temporary : " << tempInstallDirectory << std::endl); |