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 /cmake | |
| 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 'cmake')
| -rw-r--r-- | cmake/modules/FindNSIS.cmake | 15 | ||||
| -rw-r--r-- | cmake/modules/WiresharkPlugin.cmake | 1 |
2 files changed, 16 insertions, 0 deletions
diff --git a/cmake/modules/FindNSIS.cmake b/cmake/modules/FindNSIS.cmake new file mode 100644 index 0000000000..250104c274 --- /dev/null +++ b/cmake/modules/FindNSIS.cmake @@ -0,0 +1,15 @@ +# +# - Find NSIS +# Find the makensis command +# +# MAKENSIS_EXECUTABLE - path to the makensis utility. +# CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS - System runtime DLLs + +# Find makensis +find_program(MAKENSIS_EXECUTABLE makensis + PATH "$ENV{PROGRAMFILES}/NSIS" "$ENV{PROGRAMW6432}/NSIS" + DOC "Path to the makensis utility." +) + +set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE) +include(InstallRequiredSystemLibraries) diff --git a/cmake/modules/WiresharkPlugin.cmake b/cmake/modules/WiresharkPlugin.cmake index e5c69fca97..acb0506612 100644 --- a/cmake/modules/WiresharkPlugin.cmake +++ b/cmake/modules/WiresharkPlugin.cmake @@ -58,4 +58,5 @@ macro(ADD_PLUGIN_LIBRARY _plugin) endforeach() target_link_libraries(${_plugin} epan) + add_dependencies(plugins ${_plugin}) endmacro() |