diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-04-29 23:22:21 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-04-29 23:22:21 (GMT) |
| commit | 619ebce6cf2a0b03915387fb3c9bbd1cb39db795 (patch) | |
| tree | f9af5d03d26d069359ff1c2ba9d4796943ba236f /Source/CPack | |
| parent | 16d126675d78861c9b40632d9b6196a126719598 (diff) | |
| download | CMake-619ebce6cf2a0b03915387fb3c9bbd1cb39db795.zip CMake-619ebce6cf2a0b03915387fb3c9bbd1cb39db795.tar.gz CMake-619ebce6cf2a0b03915387fb3c9bbd1cb39db795.tar.bz2 | |
ENH: Add NSIS options page for path selection, fix adding and removing from path, add welcome page and license page
Diffstat (limited to 'Source/CPack')
| -rw-r--r-- | Source/CPack/cmCPackNSISGenerator.cxx | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/Source/CPack/cmCPackNSISGenerator.cxx b/Source/CPack/cmCPackNSISGenerator.cxx index 2f5363d..31345f3 100644 --- a/Source/CPack/cmCPackNSISGenerator.cxx +++ b/Source/CPack/cmCPackNSISGenerator.cxx @@ -53,9 +53,19 @@ int cmCPackNSISGenerator::CompressFiles(const char* outFileName, << std::endl); return false; } + std::string nsisInInstallOptions + = this->FindTemplate("NSIS.InstallOptions.ini.in"); + if ( nsisInInstallOptions.size() == 0 ) + { + cmCPackLogger(cmCPackLog::LOG_ERROR, + "CPack error: Could not find NSIS installer options file." + << std::endl); + return false; + } std::string nsisFileName = this->GetOption("CPACK_TOPLEVEL_DIRECTORY"); std::string tmpFile = nsisFileName; tmpFile += "/NSISOutput.log"; + std::string nsisInstallOptions = nsisFileName + "/NSIS.InstallOptions.ini"; nsisFileName += "/project.nsi"; cmOStringStream str; std::vector<std::string>::const_iterator it; @@ -90,6 +100,7 @@ int cmCPackNSISGenerator::CompressFiles(const char* outFileName, cmCPackLogger(cmCPackLog::LOG_VERBOSE, "Configure file: " << nsisInFileName << " to " << nsisFileName << std::endl); + this->ConfigureFile(nsisInInstallOptions.c_str(), nsisInstallOptions.c_str()); this->ConfigureFile(nsisInFileName.c_str(), nsisFileName.c_str()); std::string nsisCmd = "\""; nsisCmd += this->GetOption("CPACK_INSTALLER_PROGRAM"); |