diff options
| author | Marc Chevrier <marc.chevrier@sap.com> | 2016-03-01 08:49:37 (GMT) |
|---|---|---|
| committer | Nils Gladitz <nilsgladitz@gmail.com> | 2016-03-01 08:50:46 (GMT) |
| commit | d4482dd9c9a5bb7e817ffe38941760d0492ad0d9 (patch) | |
| tree | 632ee57d881a276b98dff8d71492d6ca8444a03f /Modules | |
| parent | 3cc22dffb766f1e6ef90c3809d5954b14106b61d (diff) | |
| download | CMake-d4482dd9c9a5bb7e817ffe38941760d0492ad0d9.zip CMake-d4482dd9c9a5bb7e817ffe38941760d0492ad0d9.tar.gz CMake-d4482dd9c9a5bb7e817ffe38941760d0492ad0d9.tar.bz2 | |
CPackWIX: Support binary-only WiX installations
Also fix URLUPDATEINFO -> ARPURLUPDATEINFO reference
in CPACK_WIX_PROPERTY_<PROPERTY> examples.
Reviewed-by: Nils Gladitz <nilsgladitz@gmail.com>
Diffstat (limited to 'Modules')
| -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.") |