diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-01-06 15:07:50 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-03-12 22:47:42 +0000 |
| commit | 2ef72cb7aa87854037defa1fdb91979f01b925cb (patch) | |
| tree | e694ac2bfe98f6c8f8c4f574eab5e9058b26a7f8 /packaging/nsis/uninstall.nsi | |
| parent | 436a0645138515480730f1e1679b47f30cc88f79 (diff) | |
CMake: Add a top-level nsis_package target.
Add packaging/nsis/CMakeLists.txt and use it to generate each NSIS include
file. Add macros to generate packaging-related targets and invoke them
from the top-level CMakeLists.txt.
Add a top-level "plugins" target. Copy plugins to "plugins" in each of
our staging directories instead of "plugins/$VERSION".
Add missing files to the copy_data_files and copy_cli_dlls targets.
Add all files in the NSIS package from the staging directory.
Drop a bunch of no-longer-needed defines, e.g. MSVC_VARIANT.
Change-Id: Ib1079260d164c65118050f1431af8e582cd577fa
Reviewed-on: https://code.wireshark.org/review/6459
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'packaging/nsis/uninstall.nsi')
| -rwxr-xr-x | packaging/nsis/uninstall.nsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packaging/nsis/uninstall.nsi b/packaging/nsis/uninstall.nsi index 751367570a..d5d1e242eb 100755 --- a/packaging/nsis/uninstall.nsi +++ b/packaging/nsis/uninstall.nsi @@ -54,7 +54,7 @@ ShowUninstDetails show Function .onInit ; MUST be the absolute path to our staging directory. - WriteUninstaller "${MAKEDIR}\${STAGING_DIR}\${UNINSTALLER_NAME}" + WriteUninstaller "${STAGING_DIR}\${UNINSTALLER_NAME}" SetErrorLevel 0 Quit FunctionEnd |