diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-04-07 12:55:42 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-04-14 19:11:50 +0000 |
| commit | 495740f801ccb4ce73f517a3a99ba8dacdba744c (patch) | |
| tree | 9d432f032b7202d80575c0bfeaf3ba2944050db0 /packaging/nsis | |
| parent | 1404605513cedd34070154aa355663b8e4734bc4 (diff) | |
| download | wireshark-495740f801ccb4ce73f517a3a99ba8dacdba744c.tar.gz wireshark-495740f801ccb4ce73f517a3a99ba8dacdba744c.tar.bz2 wireshark-495740f801ccb4ce73f517a3a99ba8dacdba744c.zip | |
CMake: Initial PortableApps targets.
Add portableapps_app_dir and portableapps_package targets.
Change-Id: Ifea3d952eef0e267de6364999d45807236d99102
Reviewed-on: https://code.wireshark.org/review/8025
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'packaging/nsis')
| -rw-r--r-- | packaging/nsis/CMakeLists.txt | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/packaging/nsis/CMakeLists.txt b/packaging/nsis/CMakeLists.txt index bf56d23b37..463a38d4cf 100644 --- a/packaging/nsis/CMakeLists.txt +++ b/packaging/nsis/CMakeLists.txt @@ -22,6 +22,14 @@ # We should use CPack to generate the NSIS package. Even better, # we should use CPack to create a .msi using WIX. +set(NSIS_GENERATED_FILES + ${CMAKE_CURRENT_BINARY_DIR}/all-manifest.nsh + ${CMAKE_CURRENT_BINARY_DIR}/config.nsh + ${CMAKE_CURRENT_BINARY_DIR}/gtk-dll-manifest.nsh + ${CMAKE_CURRENT_BINARY_DIR}/qt-dll-manifest.nsh + PARENT_SCOPE +) + set(NSIS_FILES wireshark.nsi uninstall.nsi @@ -30,10 +38,7 @@ set(NSIS_FILES servicelib.nsh AdditionalTasksPage.ini WinPcapPage.ini - ${CMAKE_CURRENT_BINARY_DIR}/all-manifest.nsh - ${CMAKE_CURRENT_BINARY_DIR}/config.nsh - ${CMAKE_CURRENT_BINARY_DIR}/gtk-dll-manifest.nsh - ${CMAKE_CURRENT_BINARY_DIR}/qt-dll-manifest.nsh + ${NSIS_GENERATED_FILES} PARENT_SCOPE ) @@ -198,7 +203,7 @@ macro( ADD_NSIS_UNINSTALLER_TARGET ) endmacro( ADD_NSIS_UNINSTALLER_TARGET ) macro( ADD_NSIS_PACKAGE_TARGET ) - set (_nsis_package ${CMAKE_BINARY_DIR}/packaging/nsis/wireshark-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe) + set (_nsis_package ${CMAKE_BINARY_DIR}/packaging/nsis/Wireshark-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe) add_custom_target(nsis_package DEPENDS |