diff options
| author | Brad King <brad.king@kitware.com> | 2016-09-20 12:40:49 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-09-20 12:40:49 (GMT) |
| commit | 8d83c9d100b8952ec0793e4cb0e30d5b3ec8f164 (patch) | |
| tree | 92737bee59500caf34982951f7f47ec4c80313a8 /Source/CPack/IFW/cmCPackIFWGenerator.cxx | |
| parent | 8b0f246694e5e7a7e71187204ba30ddcc537b32f (diff) | |
| parent | b807cd9b54e4a9324ddd64281254b6fe80be5b24 (diff) | |
| download | CMake-8d83c9d100b8952ec0793e4cb0e30d5b3ec8f164.zip CMake-8d83c9d100b8952ec0793e4cb0e30d5b3ec8f164.tar.gz CMake-8d83c9d100b8952ec0793e4cb0e30d5b3ec8f164.tar.bz2 | |
Merge topic 'ifw-package-resources'
b807cd9b CPackIFW: Add 'cpack_ifw_add_package_resources' command
Diffstat (limited to 'Source/CPack/IFW/cmCPackIFWGenerator.cxx')
| -rw-r--r-- | Source/CPack/IFW/cmCPackIFWGenerator.cxx | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/Source/CPack/IFW/cmCPackIFWGenerator.cxx b/Source/CPack/IFW/cmCPackIFWGenerator.cxx index a6f1585..fa7e0aa 100644 --- a/Source/CPack/IFW/cmCPackIFWGenerator.cxx +++ b/Source/CPack/IFW/cmCPackIFWGenerator.cxx @@ -130,6 +130,19 @@ int cmCPackIFWGenerator::PackageFiles() { std::string ifwCmd = BinCreator; ifwCmd += " -c " + this->toplevel + "/config/config.xml"; + + if (!Installer.Resources.empty()) { + ifwCmd += " -r "; + std::vector<std::string>::iterator it = Installer.Resources.begin(); + std::string path = this->toplevel + "/resources/"; + ifwCmd += path + *it; + ++it; + while (it != Installer.Resources.end()) { + ifwCmd += "," + path + *it; + ++it; + } + } + ifwCmd += " -p " + this->toplevel + "/packages"; if (!PkgsDirsVector.empty()) { |