diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2017-09-22 19:13:33 +0100 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2017-09-23 17:49:08 +0000 |
| commit | fd4dc6f115868f18e787f4bffaf8f8c5ceccff82 (patch) | |
| tree | 2d3227bf7637108fae61400b43f15041554808d4 /CMakeLists.txt | |
| parent | caa9b19107a097a64552e5fc071f4d7fd218b59e (diff) | |
plugins: Fixups for g9260461f4f
Put plugins in CMake build dir with a version subdir. This avoids some
weird special cases, however running with autotools from build dir
displays the wrong global folder in about->folders. Unfortunately
the hack to run from the autotools build dir is troublesome.
Various fixes for Windows builds.
Try to fix also build dir issue loading plugins on macOS with
ENABLE_APPLICATION_BUNDLE (blind).
Change-Id: Ic3c7c21f5850c12a53844202d61fa0592b45739c
Reviewed-on: https://code.wireshark.org/review/23657
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d06049c5a2..e6c0a32e35 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1425,13 +1425,12 @@ else() endif() if(ENABLE_APPLICATION_BUNDLE) - set(_plugin_dir "${CMAKE_BINARY_DIR}/run/Wireshark.app/Contents/PlugIns/wireshark") + set(_plugin_dir "${CMAKE_BINARY_DIR}/run/Wireshark.app/Contents/PlugIns/wireshark/${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}") else() get_target_property(_libwireshark_location epan LOCATION) get_filename_component(_plugin_dir "${_libwireshark_location}" PATH) - set(_plugin_dir "${_plugin_dir}/plugins") + set(_plugin_dir "${_plugin_dir}/${PLUGIN_VERSION_DIR}") endif() -# XXX The NMake environment appends the version. Should we do so here? set (PLUGIN_DIR ${_plugin_dir} CACHE INTERNAL "Build time plugin location.") foreach(_plugin_src_dir ${PLUGIN_SRC_DIRS}) |