diff options
| author | João Valverde <j@v6e.pt> | 2023-05-29 11:33:27 +0100 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2023-05-29 11:39:22 +0100 |
| commit | 9237d3777d0c14311489c2b133b40427af3f772c (patch) | |
| tree | e561e81a5856a5364999ecdc70a79ebfbe63acc0 /packaging/nsis | |
| parent | 28cc5a1a3e7c72e5aa416e762a2852272da1ae19 (diff) | |
NSIS: Make Lua optional
Allow building an NSIS installer without Lua.
Restore the use of STAGING_DIR instead of TOP_SRC_DIR, to
keep to the pre-existing logic.
Remove a duplicate line.
Diffstat (limited to 'packaging/nsis')
| -rw-r--r-- | packaging/nsis/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | packaging/nsis/wireshark-config.nsh.in | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/packaging/nsis/CMakeLists.txt b/packaging/nsis/CMakeLists.txt index 602d27f2c1..5fafc25f53 100644 --- a/packaging/nsis/CMakeLists.txt +++ b/packaging/nsis/CMakeLists.txt @@ -182,9 +182,11 @@ if (BUILD_wireshark) set(_all_manifest_contents "${_all_manifest_contents}File \"${_path}\"\n") endforeach() endif() - foreach(_script "init.lua" "console.lua" "dtd_gen.lua") - set(_all_manifest_contents "${_all_manifest_contents}File \"\${TOP_SRC_DIR}\\epan\\wslua\\${_script}\"\n") - endforeach() + if(LUA_FOUND) + foreach(_script "init.lua" "console.lua" "dtd_gen.lua") + set(_all_manifest_contents "${_all_manifest_contents}File \"\${STAGING_DIR}\\${_script}\"\n") + endforeach() + endif() file(WRITE "${_all_manifest}" "${_all_manifest_contents}") endif() diff --git a/packaging/nsis/wireshark-config.nsh.in b/packaging/nsis/wireshark-config.nsh.in index 17057128ba..6e19d1ae59 100644 --- a/packaging/nsis/wireshark-config.nsh.in +++ b/packaging/nsis/wireshark-config.nsh.in @@ -24,7 +24,6 @@ #cmakedefine MMDBRESOLVE_EXE @MMDBRESOLVE_EXE@ #cmakedefine BUILD_etwdump #cmakedefine SPANDSP_FOUND -#cmakedefine SPANDSP_FOUND #cmakedefine BCG729_FOUND #cmakedefine SBC_FOUND #cmakedefine ILBC_FOUND |