diff options
| author | Brad King <brad.king@kitware.com> | 2016-03-07 15:02:45 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-03-07 15:02:45 (GMT) |
| commit | 7fc8e4d36d7f198ead73fda577f73bdf650b0c99 (patch) | |
| tree | 266e17b81f9d2bdccb03f33fc0aca40c9390d983 | |
| parent | cfb4d7736e030c08d047153da635b61ca97e3135 (diff) | |
| parent | d4482dd9c9a5bb7e817ffe38941760d0492ad0d9 (diff) | |
| download | CMake-7fc8e4d36d7f198ead73fda577f73bdf650b0c99.zip CMake-7fc8e4d36d7f198ead73fda577f73bdf650b0c99.tar.gz CMake-7fc8e4d36d7f198ead73fda577f73bdf650b0c99.tar.bz2 | |
Merge topic 'wix-module-fixes'
d4482dd9 CPackWIX: Support binary-only WiX installations
| -rw-r--r-- | Modules/CPackWIX.cmake | 6 |
1 files 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.") |