diff options
| author | Gerald Combs <gerald@wireshark.org> | 2018-03-06 15:29:34 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2018-03-07 00:16:54 +0000 |
| commit | e3c263c01236e7c31ec23f6c3d8750d7e92fb5a3 (patch) | |
| tree | 54fcc9a118fc5ecb29984bd213837902fcfb8e0c /packaging/wix/CMakeLists.txt | |
| parent | f0fb6ee50c953ac07eb76d47036a761a57f35491 (diff) | |
NSIS, WiX: Handle the presence or absence of mmdbresolve.
Only install mmdbresolve if MAXMINDDB_FOUND is true.
Fixup the Qt about box and WiX GTK defines while we're here.
Change-Id: I7ac3c21ddb4aebc1dae1c3d8cfd2bcafc4139d2e
Reviewed-on: https://code.wireshark.org/review/26299
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'packaging/wix/CMakeLists.txt')
| -rw-r--r-- | packaging/wix/CMakeLists.txt | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/packaging/wix/CMakeLists.txt b/packaging/wix/CMakeLists.txt index 352e53f854..881f8610c4 100644 --- a/packaging/wix/CMakeLists.txt +++ b/packaging/wix/CMakeLists.txt @@ -300,11 +300,15 @@ endif() file(APPEND "${_gtk_dll_manifest_wix}" "\n</Wix>\n") if(BUILD_wireshark_gtk AND GTK_FOUND) - set(use_gtk "-dGTK_DIR") + set(d_gtk_dir "-dGTK_DIR") endif() if(SMI_DIR) - set(use_smi "-dSMI_DIR") + set(d_smi_dir "-dSMI_DIR") +endif() + +if (MAXMINDDB_FOUND) + set(d_mmdbresolve_exe "-dMMDBRESOLVE_EXE") endif() set(WIX_CANDLE_DEFINES @@ -323,8 +327,9 @@ set(WIX_CANDLE_DEFINES -dSnmpMibDir=${ARCHIVE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}/snmp/mibs -dVCRedistVersion=${MSVC_CRT_VERSION} -dVCRedistDir=${MERGE_MODULE_DIR} - ${use_gtk} - ${use_smi} + ${d_gtk_dir} + ${d_smi_dir} + ${d_mmdbresolve_exe} -arch ${TARGET_MACHINE} -ext WixUIExtension -I${CMAKE_SOURCE_DIR}/packaging/wix |