diff options
| author | Gerald Combs <gerald@wireshark.org> | 2018-02-10 13:26:57 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2018-02-10 23:13:37 +0000 |
| commit | aee743f9edde1f0a575d8384c54c23376d00865c (patch) | |
| tree | 6a3693220b0010b66898defcf1f151b796b59239 /packaging | |
| parent | d16308c89a4399897874ea660267f0c6303872dc (diff) | |
Write our NSIS installer to the build directory.
Write our NSIS installer to ${CMAKE_BINARY_DIR}/packaging/nsis instead
of ${CMAKE_SOURCE_DIR}/packaging/nsis.
Change-Id: I6d662b2726dc61fb199509575797b5dfe0d8fdfa
Reviewed-on: https://code.wireshark.org/review/25725
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/nsis/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/packaging/nsis/CMakeLists.txt b/packaging/nsis/CMakeLists.txt index af72339c61..a32b1ab8e7 100644 --- a/packaging/nsis/CMakeLists.txt +++ b/packaging/nsis/CMakeLists.txt @@ -177,11 +177,13 @@ endif() file(WRITE "${_gtk_dll_manifest}" "${_gtk_dll_manifest_contents}") file(TO_NATIVE_PATH "${DATAFILE_DIR}" _staging_dir) +file(TO_NATIVE_PATH "${CMAKE_CURRENT_BINARY_DIR}" _outfile_dir) file(TO_NATIVE_PATH "${CMAKE_CURRENT_BINARY_DIR}" _nsis_include_dir) # Variables we can't set via config.nsh. set(NSIS_DEFINES -DSTAGING_DIR=${_staging_dir} + -DOUTFILE_DIR=${_outfile_dir} -DNSIS_INCLUDE_DIR=${_nsis_include_dir} PARENT_SCOPE ) diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index c23c84ff9a..c1977f10c8 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -36,7 +36,7 @@ ${StrRep} ; ============================================================================ ; The file to write -OutFile "${PROGRAM_NAME}-${WIRESHARK_TARGET_PLATFORM}-${VERSION}.exe" +OutFile "${OUTFILE_DIR}\${PROGRAM_NAME}-${WIRESHARK_TARGET_PLATFORM}-${VERSION}.exe" ; Installer icon Icon "${TOP_SRC_DIR}\image\wiresharkinst.ico" |