diff options
| author | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2019-02-18 14:54:51 (GMT) |
|---|---|---|
| committer | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2019-02-19 01:48:19 (GMT) |
| commit | 0281f9a4cad6e189601a87c9ccfba8c54e71e14b (patch) | |
| tree | 7cb6ecd89a38397e4ca191078fab91f1875eedba /Source/CPack/cmCPackOSXX11Generator.cxx | |
| parent | bafd0ffa987bea9216e7722c027478f26d5e8f6a (diff) | |
| download | CMake-0281f9a4cad6e189601a87c9ccfba8c54e71e14b.zip CMake-0281f9a4cad6e189601a87c9ccfba8c54e71e14b.tar.gz CMake-0281f9a4cad6e189601a87c9ccfba8c54e71e14b.tar.bz2 | |
cmMakefile::ConfigureFile: Accept `std::string` parameters
Diffstat (limited to 'Source/CPack/cmCPackOSXX11Generator.cxx')
| -rw-r--r-- | Source/CPack/cmCPackOSXX11Generator.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/CPack/cmCPackOSXX11Generator.cxx b/Source/CPack/cmCPackOSXX11Generator.cxx index 85248c6..90e0afe 100644 --- a/Source/CPack/cmCPackOSXX11Generator.cxx +++ b/Source/CPack/cmCPackOSXX11Generator.cxx @@ -83,7 +83,7 @@ int cmCPackOSXX11Generator::PackageFiles() return 0; } std::string destFileName = resourcesDirectory + "/" + iconFileName; - this->ConfigureFile(iconFile, destFileName.c_str(), true); + this->ConfigureFile(iconFile, destFileName, true); this->SetOptionIfNotSet("CPACK_APPLE_GUI_ICON", iconFileName.c_str()); } @@ -236,7 +236,7 @@ bool cmCPackOSXX11Generator::CopyCreateResourceFile(const std::string& name) cmCPackLogger(cmCPackLog::LOG_VERBOSE, "Configure file: " << (inFileName ? inFileName : "(NULL)") << " to " << destFileName << std::endl); - this->ConfigureFile(inFileName, destFileName.c_str()); + this->ConfigureFile(inFileName, destFileName); return true; } */ @@ -266,7 +266,7 @@ bool cmCPackOSXX11Generator::CopyResourcePlistFile( cmCPackLogger(cmCPackLog::LOG_VERBOSE, "Configure file: " << inFileName << " to " << destFileName << std::endl); - this->ConfigureFile(inFileName.c_str(), destFileName.c_str(), copyOnly); + this->ConfigureFile(inFileName, destFileName, copyOnly); return true; } |