diff options
| author | João Valverde <j@v6e.pt> | 2023-05-26 23:57:23 +0100 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2023-05-29 01:12:04 +0000 |
| commit | 07825e634ef1d03900328160edb1fec41cd25fca (patch) | |
| tree | 185cbae617ae0ed3dfe3f4865012f790c87d52cc /packaging/nsis | |
| parent | 155da04d67273e44a8ce57020bbaca56ff536bf6 (diff) | |
NSIS: Make command line portable across platforms
Use -option instead of /option. This will also work on Windows.
The reverse is not true for Linux.
Ping #19108
Diffstat (limited to 'packaging/nsis')
| -rw-r--r-- | packaging/nsis/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | packaging/nsis/wireshark-config.nsh.in | 1 |
2 files changed, 8 insertions, 8 deletions
diff --git a/packaging/nsis/CMakeLists.txt b/packaging/nsis/CMakeLists.txt index 4125d3af74..29e5494b18 100644 --- a/packaging/nsis/CMakeLists.txt +++ b/packaging/nsis/CMakeLists.txt @@ -228,10 +228,10 @@ file(TO_NATIVE_PATH "${CMAKE_CURRENT_BINARY_DIR}" _nsis_include_dir) # Variables we can't set via config.nsh. set(NSIS_OPTIONS - /DSTAGING_DIR=${_staging_dir} - /DOUTFILE_DIR=${_outfile_dir} - /DNSIS_INCLUDE_DIR=${_nsis_include_dir} - /V2 + -DSTAGING_DIR=${_staging_dir} + -DOUTFILE_DIR=${_outfile_dir} + -DNSIS_INCLUDE_DIR=${_nsis_include_dir} + -V2 PARENT_SCOPE ) @@ -328,9 +328,8 @@ macro( ADD_NSIS_PACKAGE_TARGETS ) # Note that executables and DLLs *must* be built separately add_custom_target(wireshark_nsis COMMAND ${MAKENSIS_EXECUTABLE} ${NSIS_OPTIONS} - $<$<CONFIG:Debug>:/DBUNDLE_DEBUG_DLLS> - $<$<BOOL:${MSVC}>:/DUSE_VCREDIST> - $<$<BOOL:${BUILD_etwdump}>:/DHAVE_ETWDUMP> + $<$<CONFIG:Debug>:-DBUNDLE_DEBUG_DLLS> + $<$<BOOL:${MSVC}>:-DUSE_VCREDIST> wireshark.nsi WORKING_DIRECTORY ${_nsis_source_dir} ) @@ -372,7 +371,7 @@ macro( ADD_NSIS_PACKAGE_TARGETS ) # Note that executables and DLLs *must* be built separately add_custom_target(logray_nsis COMMAND ${MAKENSIS_EXECUTABLE} ${NSIS_OPTIONS} - $<$<CONFIG:Debug>:/DBUNDLE_DEBUG_DLLS> + $<$<CONFIG:Debug>:-DBUNDLE_DEBUG_DLLS> logray.nsi WORKING_DIRECTORY ${_nsis_source_dir} ) diff --git a/packaging/nsis/wireshark-config.nsh.in b/packaging/nsis/wireshark-config.nsh.in index 7404c3e7d0..3a09e81282 100644 --- a/packaging/nsis/wireshark-config.nsh.in +++ b/packaging/nsis/wireshark-config.nsh.in @@ -22,6 +22,7 @@ # Optional components #cmakedefine MMDBRESOLVE_EXE @MMDBRESOLVE_EXE@ +#cmakedefine BUILD_etwdump HAVE_ETWDUMP #cmakedefine DOCBOOK_DIR "@DOCBOOK_DIR@" |