From d4482dd9c9a5bb7e817ffe38941760d0492ad0d9 Mon Sep 17 00:00:00 2001 From: Marc Chevrier Date: Tue, 1 Mar 2016 09:49:37 +0100 Subject: CPackWIX: Support binary-only WiX installations Also fix URLUPDATEINFO -> ARPURLUPDATEINFO reference in CPACK_WIX_PROPERTY_ examples. Reviewed-by: Nils Gladitz --- Modules/CPackWIX.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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.") -- cgit v0.12