diff options
| author | Marc Chevrier <marc.chevrier@gmail.com> | 2021-09-14 16:47:30 (GMT) |
|---|---|---|
| committer | Marc Chevrier <marc.chevrier@gmail.com> | 2021-09-15 16:30:49 (GMT) |
| commit | 7fce78982bbd199e2c34cfec75fca7605f32f43b (patch) | |
| tree | 12677805b179c352abfcbde5096f6af53884dfdc /Source/CPack/cmCPackPKGGenerator.cxx | |
| parent | 7aeb2622789d04e57051f3592908c5f27d31bb17 (diff) | |
| download | CMake-7fce78982bbd199e2c34cfec75fca7605f32f43b.zip CMake-7fce78982bbd199e2c34cfec75fca7605f32f43b.tar.gz CMake-7fce78982bbd199e2c34cfec75fca7605f32f43b.tar.bz2 | |
Use new SetOption signatures
Diffstat (limited to 'Source/CPack/cmCPackPKGGenerator.cxx')
| -rw-r--r-- | Source/CPack/cmCPackPKGGenerator.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/CPack/cmCPackPKGGenerator.cxx b/Source/CPack/cmCPackPKGGenerator.cxx index a1eba56..171fbb2 100644 --- a/Source/CPack/cmCPackPKGGenerator.cxx +++ b/Source/CPack/cmCPackPKGGenerator.cxx @@ -167,7 +167,7 @@ void cmCPackPKGGenerator::WriteDistributionFile(const char* metapackageFile, // Dark Aqua this->CreateBackground("darkAqua", metapackageFile, genName, xout); - this->SetOption("CPACK_PACKAGEMAKER_CHOICES", choiceOut.str().c_str()); + this->SetOption("CPACK_PACKAGEMAKER_CHOICES", choiceOut.str()); // Create the distribution.dist file in the metapackage to turn it // into a distribution package. @@ -348,8 +348,7 @@ bool cmCPackPKGGenerator::CopyCreateResourceFile(const std::string& name, // Set this so that distribution.dist gets the right name (without // the path). - this->SetOption("CPACK_RESOURCE_FILE_" + uname + "_NOPATH", - (name + ext).c_str()); + this->SetOption("CPACK_RESOURCE_FILE_" + uname + "_NOPATH", (name + ext)); cmCPackLogger(cmCPackLog::LOG_VERBOSE, "Configure file: " << (inFileName ? *inFileName : "(NULL)") |