mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-07 22:30:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

CPack/IFW: Actually ignore missing ProductImages

Browse Source
This commit is contained in:
Julien Marrec
2024-09-05 16:58:05 +02:00
committed by Brad King
parent 3c214f2638
commit d58f90f628
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Source/CPack/IFW/cmCPackIFWInstaller.cxx
View File

@@ -2,6 +2,7 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmCPackIFWInstaller.h"
#include <algorithm>
#include <cstddef>
#include <sstream>
#include <utility>
@@ -306,14 +307,20 @@ void cmCPackIFWInstaller::ConfigureFromOptions()
this->GetOption("CPACK_IFW_PACKAGE_PRODUCT_IMAGES")) {
this->ProductImages.clear();
cmExpandList(productImages, this->ProductImages);
for (const auto& file : this->ProductImages) {
auto erase_missing_file_pred = [this](const std::string& file) -> bool {
if (!cmSystemTools::FileExists(file)) {
// The warning will say skipped, but there will later be a hard error
// when the binarycreator tool tries to read the missing file.
this->printSkippedOptionWarning("CPACK_IFW_PACKAGE_PRODUCT_IMAGES",
file);
return true;
}
}
return false;
};
this->ProductImages.erase(std::remove_if(this->ProductImages.begin(),
this->ProductImages.end(),
erase_missing_file_pred),
this->ProductImages.end());
}
// Run program, run program arguments, and run program description