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 cc20b98859ecfaafe607d2bc2075ef71dde4a07d (commit) via d4482dd9c9a5bb7e817ffe38941760d0492ad0d9 (commit) via 3cc22dffb766f1e6ef90c3809d5954b14106b61d (commit) via 26d615ad9ff58e1cae3b605efeb0cd1b6823622a (commit) from 84a28fb506bbb398eab98c3524c050adc43acd6d (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=cc20b98859ecfaafe607d2bc2075ef71dde4a07d commit cc20b98859ecfaafe607d2bc2075ef71dde4a07d Merge: 84a28fb d4482dd Author: Nils Gladitz <nilsglad...@gmail.com> AuthorDate: Tue Mar 1 03:53:16 2016 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Tue Mar 1 03:53:16 2016 -0500 Merge topic 'wix-module-fixes' into next d4482dd9 CPackWIX: Support binary-only WiX installations 3cc22dff CMake Nightly Date Stamp 26d615ad CMake Nightly Date Stamp https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d4482dd9c9a5bb7e817ffe38941760d0492ad0d9 commit d4482dd9c9a5bb7e817ffe38941760d0492ad0d9 Author: Marc Chevrier <marc.chevr...@sap.com> AuthorDate: Tue Mar 1 09:49:37 2016 +0100 Commit: Nils Gladitz <nilsglad...@gmail.com> CommitDate: Tue Mar 1 09:50:46 2016 +0100 CPackWIX: Support binary-only WiX installations Also fix URLUPDATEINFO -> ARPURLUPDATEINFO reference in CPACK_WIX_PROPERTY_<PROPERTY> examples. Reviewed-by: Nils Gladitz <nilsglad...@gmail.com> diff --git a/Modules/CPackWIX.cmake b/Modules/CPackWIX.cmake index 4994005..3c90561 100644 --- a/Modules/CPackWIX.cmake +++ b/Modules/CPackWIX.cmake @@ -234,7 +234,7 @@ # * ARPCOMMENTS - Comments # * ARPHELPLINK - Help and support information URL # * ARPURLINFOABOUT - General information URL -# * URLUPDATEINFO - Update information URL +# * ARPURLUPDATEINFO - Update information URL # * ARPHELPTELEPHONE - Help and support telephone number # * ARPSIZE - Size (in kilobytes) of the application @@ -256,14 +256,14 @@ if(NOT CPACK_WIX_ROOT) endif() find_program(CPACK_WIX_CANDLE_EXECUTABLE candle - PATHS "${CPACK_WIX_ROOT}/bin") + PATHS "${CPACK_WIX_ROOT}" PATH_SUFFIXES "bin") if(NOT CPACK_WIX_CANDLE_EXECUTABLE) message(FATAL_ERROR "Could not find the WiX candle executable.") endif() find_program(CPACK_WIX_LIGHT_EXECUTABLE light - PATHS "${CPACK_WIX_ROOT}/bin") + PATHS "${CPACK_WIX_ROOT}" PATH_SUFFIXES "bin") if(NOT CPACK_WIX_LIGHT_EXECUTABLE) message(FATAL_ERROR "Could not find the WiX light executable.") ----------------------------------------------------------------------- Summary of changes: Modules/CPackWIX.cmake | 6 +++--- Source/CMakeVersion.cmake | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits