Skip to content
Snippets Groups Projects
Commit d4482dd9 authored by Marc Chevrier's avatar Marc Chevrier Committed by Nils Gladitz
Browse files

CPackWIX: Support binary-only WiX installations


Also fix URLUPDATEINFO -> ARPURLUPDATEINFO reference
in CPACK_WIX_PROPERTY_<PROPERTY> examples.

Reviewed-by: default avatarNils Gladitz <nilsgladitz@gmail.com>
parent 3cc22dff
No related branches found
No related tags found
No related merge requests found
...@@ -234,7 +234,7 @@ ...@@ -234,7 +234,7 @@
# * ARPCOMMENTS - Comments # * ARPCOMMENTS - Comments
# * ARPHELPLINK - Help and support information URL # * ARPHELPLINK - Help and support information URL
# * ARPURLINFOABOUT - General information URL # * ARPURLINFOABOUT - General information URL
# * URLUPDATEINFO - Update information URL # * ARPURLUPDATEINFO - Update information URL
# * ARPHELPTELEPHONE - Help and support telephone number # * ARPHELPTELEPHONE - Help and support telephone number
# * ARPSIZE - Size (in kilobytes) of the application # * ARPSIZE - Size (in kilobytes) of the application
...@@ -256,14 +256,14 @@ if(NOT CPACK_WIX_ROOT) ...@@ -256,14 +256,14 @@ if(NOT CPACK_WIX_ROOT)
endif() endif()
find_program(CPACK_WIX_CANDLE_EXECUTABLE candle 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) if(NOT CPACK_WIX_CANDLE_EXECUTABLE)
message(FATAL_ERROR "Could not find the WiX candle executable.") message(FATAL_ERROR "Could not find the WiX candle executable.")
endif() endif()
find_program(CPACK_WIX_LIGHT_EXECUTABLE light 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) if(NOT CPACK_WIX_LIGHT_EXECUTABLE)
message(FATAL_ERROR "Could not find the WiX light executable.") message(FATAL_ERROR "Could not find the WiX light executable.")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment