Write our NSIS installer to the build directory.
authorGerald Combs <gerald@wireshark.org>
Sat, 10 Feb 2018 21:26:57 +0000 (13:26 -0800)
committerGerald Combs <gerald@wireshark.org>
Sat, 10 Feb 2018 23:13:37 +0000 (23:13 +0000)
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>
packaging/nsis/CMakeLists.txt
packaging/nsis/wireshark.nsi

index af72339c61f293764b399ba32f7c5066c8266f25..a32b1ab8e75975554f2de875f4e4f789fe11752a 100644 (file)
@@ -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
 )
index c23c84ff9a23939e281dc262050636ab864e0776..c1977f10c8deb771152b6fc3d11431ba58021291 100644 (file)
@@ -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"