diff options
| author | Nils Gladitz <nilsgladitz@gmail.com> | 2015-12-14 22:04:41 (GMT) |
|---|---|---|
| committer | Nils Gladitz <nilsgladitz@gmail.com> | 2015-12-14 22:28:42 (GMT) |
| commit | de77d4a741c84e0b5774e79a0c84e945e25ad9f8 (patch) | |
| tree | ac2389115e181bbeb266f14d9f21f8537b0422ce /Source/CPack/WiX/cmWIXPatch.cxx | |
| parent | 38d723b37e660223a9c8a125cf01ae5a6c9977ba (diff) | |
| download | CMake-de77d4a741c84e0b5774e79a0c84e945e25ad9f8.zip CMake-de77d4a741c84e0b5774e79a0c84e945e25ad9f8.tar.gz CMake-de77d4a741c84e0b5774e79a0c84e945e25ad9f8.tar.bz2 | |
CPackWIX: Allow multiple patch files and diagnose if any are missing
CPACK_WIX_PATCH_FILE now accepts a list of patch files.
An error will now be produced if any of the patch files is missing.
Previously this would be silently ignored.
Diffstat (limited to 'Source/CPack/WiX/cmWIXPatch.cxx')
| -rw-r--r-- | Source/CPack/WiX/cmWIXPatch.cxx | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Source/CPack/WiX/cmWIXPatch.cxx b/Source/CPack/WiX/cmWIXPatch.cxx index 471c3a4..07375da 100644 --- a/Source/CPack/WiX/cmWIXPatch.cxx +++ b/Source/CPack/WiX/cmWIXPatch.cxx @@ -20,10 +20,18 @@ cmWIXPatch::cmWIXPatch(cmCPackLog* logger): } -void cmWIXPatch::LoadFragments(std::string const& patchFilePath) +bool cmWIXPatch::LoadFragments(std::string const& patchFilePath) { cmWIXPatchParser parser(Fragments, Logger); - parser.ParseFile(patchFilePath.c_str()); + if(!parser.ParseFile(patchFilePath.c_str())) + { + cmCPackLogger(cmCPackLog::LOG_ERROR, + "Failed parsing XML patch file: '" << + patchFilePath << "'" << std::endl); + return false; + } + + return true; } void cmWIXPatch::ApplyFragment( |