From 6aa0490fdca95acc0a913f9fc2bfdce39f919f9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Mon, 5 Jun 2023 10:45:20 +0100 Subject: CMake+NSIS: Allow building an unsigned installer --- packaging/nsis/wireshark-config.nsh.in | 2 ++ packaging/nsis/wireshark.nsi | 2 ++ 2 files changed, 4 insertions(+) (limited to 'packaging/nsis') diff --git a/packaging/nsis/wireshark-config.nsh.in b/packaging/nsis/wireshark-config.nsh.in index 702ef53f8b..ace70b9520 100644 --- a/packaging/nsis/wireshark-config.nsh.in +++ b/packaging/nsis/wireshark-config.nsh.in @@ -35,3 +35,5 @@ #cmakedefine SMI_DIR "@SMI_DIR@" #cmakedefine QT_DIR "@QT_DIR@" + +#cmakedefine ENABLE_SIGNED_NSIS diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 9d6fe77f67..9e2d29b746 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -1545,8 +1545,10 @@ NoFinalErrorMsg: SectionEnd ; Sign our installer and uninstaller during compilation. +!ifdef ENABLE_SIGNED_NSIS !finalize 'sign-wireshark.bat "%1"' = 0 ; %1 is replaced by the installer exe to be signed. !uninstfinalize 'sign-wireshark.bat "%1"' = 0 ; %1 is replaced by the uninstaller exe to be signed. +!endif ; ============================================================================ ; PLEASE MAKE SURE, THAT THE DESCRIPTIVE TEXT FITS INTO THE DESCRIPTION FIELD! -- cgit v1.2.3