reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2025-02-24 22:12:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge topic 'wix-module-fixes'

Browse Source 
d4482dd9 CPackWIX: Support binary-only WiX installations
This commit is contained in:
Brad King 2016-03-07 10:02:45 -05:00 committed by CMake Topic Stage
commit 7fc8e4d36d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Modules/CPackWIX.cmake
View File

@ -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)
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.")