This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 8afdd81e1c8ad9f42506fa38e5d005427beef0c0 (commit)
via b31550dba8557e9fe306b8123d172d484bb8c25c (commit)
via 96c6c8574b0a176fd27401eb2464f88c6b76b47b (commit)
from 906215d2fe7e9c6408be4c69935c150cf85210d3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8afdd81e1c8ad9f42506fa38e5d005427beef0c0
commit 8afdd81e1c8ad9f42506fa38e5d005427beef0c0
Merge: 906215d b31550d
Author: Nils Gladitz <nilsglad...@gmail.com>
AuthorDate: Mon Dec 14 17:27:50 2015 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Dec 14 17:27:50 2015 -0500
Merge topic 'release-wix-config-ng' into next
b31550db CMake: !fixup Omit desktop shortcut checkbox when not building
QtDialog
96c6c857 CPackWIX: Allow multiple patch files and diagnose if any are
missing
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b31550dba8557e9fe306b8123d172d484bb8c25c
commit b31550dba8557e9fe306b8123d172d484bb8c25c
Author: Nils Gladitz <nilsglad...@gmail.com>
AuthorDate: Mon Dec 14 23:09:11 2015 +0100
Commit: Nils Gladitz <nilsglad...@gmail.com>
CommitDate: Mon Dec 14 23:20:38 2015 +0100
CMake: !fixup Omit desktop shortcut checkbox when not building QtDialog
diff --git a/CMakeCPackOptions.cmake.in b/CMakeCPackOptions.cmake.in
index 0562732..09568c3 100644
--- a/CMakeCPackOptions.cmake.in
+++ b/CMakeCPackOptions.cmake.in
@@ -258,5 +258,7 @@ if("${CPACK_GENERATOR}" STREQUAL "WIX")
list(APPEND CPACK_WIX_PATCH_FILE
"@CMake_SOURCE_DIR@/Utilities/Release/WiX/patch_desktop_shortcut.xml"
)
+
+ set(CPACK_WIX_CANDLE_EXTRA_FLAGS "-dBUILD_QtDialog=1")
endif()
endif()
diff --git a/Utilities/Release/WiX/cmake_extra_dialog.wxs
b/Utilities/Release/WiX/cmake_extra_dialog.wxs
index 6047c08..0ee3d99 100644
--- a/Utilities/Release/WiX/cmake_extra_dialog.wxs
+++ b/Utilities/Release/WiX/cmake_extra_dialog.wxs
@@ -27,8 +27,9 @@
</RadioButtonGroup>
</Control>
- <Control Id="DesktopShortcutCheckBox"
Type="CheckBox" X="20" Y="170" Width="330" Height="18" CheckBoxValue="1"
Property="DESKTOP_SHORTCUT_REQUESTED" Text="Create CMake Desktop Icon"/>
-
+ <?ifdef BUILD_QtDialog ?>
+ <Control Id="DesktopShortcutCheckBox"
Type="CheckBox" X="20" Y="170" Width="330" Height="18" CheckBoxValue="1"
Property="DESKTOP_SHORTCUT_REQUESTED" Text="Create CMake Desktop Icon"/>
+ <?endif ?>
</Dialog>
</UI>
</Fragment>
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=96c6c8574b0a176fd27401eb2464f88c6b76b47b
commit 96c6c8574b0a176fd27401eb2464f88c6b76b47b
Author: Nils Gladitz <nilsglad...@gmail.com>
AuthorDate: Mon Dec 14 23:04:41 2015 +0100
Commit: Nils Gladitz <nilsglad...@gmail.com>
CommitDate: Mon Dec 14 23:04:41 2015 +0100
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.
diff --git a/Modules/CPackWIX.cmake b/Modules/CPackWIX.cmake
index bef8e16..4994005 100644
--- a/Modules/CPackWIX.cmake
+++ b/Modules/CPackWIX.cmake
@@ -119,7 +119,8 @@
#
# .. variable:: CPACK_WIX_PATCH_FILE
#
-# Optional XML file with fragments to be inserted into generated WiX sources
+# Optional list of XML files with fragments to be inserted into
+# generated WiX sources
#
# This optional variable can be used to specify an XML file that the
# WiX generator will use to inject fragments into its generated
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx
b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
index b55c5a5..ece327a 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
@@ -242,7 +242,16 @@ bool cmCPackWIXGenerator::InitializeWiXConfiguration()
const char* patchFilePath = GetOption("CPACK_WIX_PATCH_FILE");
if(patchFilePath)
{
- this->Patch->LoadFragments(patchFilePath);
+ std::vector<std::string> patchFilePaths;
+ cmSystemTools::ExpandListArgument(patchFilePath, patchFilePaths);
+
+ for(size_t i = 0; i < patchFilePaths.size(); ++i)
+ {
+ if(!this->Patch->LoadFragments(patchFilePaths[i]))
+ {
+ return false;
+ }
+ }
}
return true;
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(
diff --git a/Source/CPack/WiX/cmWIXPatch.h b/Source/CPack/WiX/cmWIXPatch.h
index d53fcb4..2f31a01 100644
--- a/Source/CPack/WiX/cmWIXPatch.h
+++ b/Source/CPack/WiX/cmWIXPatch.h
@@ -26,7 +26,7 @@ class cmWIXPatch
public:
cmWIXPatch(cmCPackLog* logger);
- void LoadFragments(std::string const& patchFilePath);
+ bool LoadFragments(std::string const& patchFilePath);
void ApplyFragment(std::string const& id, cmWIXSourceWriter& writer);
-----------------------------------------------------------------------
Summary of changes:
CMakeCPackOptions.cmake.in | 2 ++
Modules/CPackWIX.cmake | 3 ++-
Source/CPack/WiX/cmCPackWIXGenerator.cxx | 11 ++++++++++-
Source/CPack/WiX/cmWIXPatch.cxx | 12 ++++++++++--
Source/CPack/WiX/cmWIXPatch.h | 2 +-
Utilities/Release/WiX/cmake_extra_dialog.wxs | 5 +++--
6 files changed, 28 insertions(+), 7 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
