diff options
| author | Graham Bloice <graham.bloice@trihedral.com> | 2015-06-25 22:02:42 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-06-25 22:02:15 +0000 |
| commit | acbbce9ffbec7078e832cf4d780fdcc464ea2c7d (patch) | |
| tree | 2361af15f1bc527b40a808f0a6178e1f7997a682 /packaging/portableapps | |
| parent | 6122b4b61608e60b5636bec2bb0466de5aa825a3 (diff) | |
| download | wireshark-acbbce9ffbec7078e832cf4d780fdcc464ea2c7d.tar.gz | |
Fix Windows CMake PortableApps dependencies
The nsis_uninstall target appears to create a temporary file
uninstaller_installer.exe that is renamed to uninstall.exe
The above rename upsets the portableapps_app_dir target that is
copying files from the CMake run dir into the portable apps dir.
The change adds a dependency on nsis_uninstall to the portableapps_package
target in an attempt to sequence the copy operation.
Change-Id: I9feb55599eff000f983c23ce29c89fbd3be0a6ac
Reviewed-on: https://code.wireshark.org/review/9153
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'packaging/portableapps')
| -rw-r--r-- | packaging/portableapps/CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/packaging/portableapps/CMakeLists.txt b/packaging/portableapps/CMakeLists.txt index 39ce14ec93..d401224aeb 100644 --- a/packaging/portableapps/CMakeLists.txt +++ b/packaging/portableapps/CMakeLists.txt @@ -63,6 +63,7 @@ macro( ADD_PORTABLEAPPS_PACKAGE_TARGET ) DEPENDS portableapps_app_dir ${_portableapps_package} + nsis_uninstaller ) set_target_properties(portableapps_package PROPERTIES FOLDER "Packaging") |