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/cmCPackNSISGenerator.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/cmCPackNSISGenerator.cxx')
| -rw-r--r-- | Source/CPack/cmCPackNSISGenerator.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/CPack/cmCPackNSISGenerator.cxx b/Source/CPack/cmCPackNSISGenerator.cxx index c77eebc..6afd7d5 100644 --- a/Source/CPack/cmCPackNSISGenerator.cxx +++ b/Source/CPack/cmCPackNSISGenerator.cxx @@ -292,9 +292,8 @@ int cmCPackNSISGenerator::PackageFiles() this->SetOption("CPACK_NSIS_DEFINES", defines.c_str()); } - this->ConfigureFile(nsisInInstallOptions.c_str(), - nsisInstallOptions.c_str()); - this->ConfigureFile(nsisInFileName.c_str(), nsisFileName.c_str()); + this->ConfigureFile(nsisInInstallOptions, nsisInstallOptions); + this->ConfigureFile(nsisInFileName, nsisFileName); std::string nsisCmd = "\""; nsisCmd += this->GetOption("CPACK_INSTALLER_PROGRAM"); nsisCmd += "\" \"" + nsisFileName + "\""; |