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 /cmake/modules/WiresharkPlugin.cmake | |
| 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 'cmake/modules/WiresharkPlugin.cmake')
| -rw-r--r-- | cmake/modules/WiresharkPlugin.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/modules/WiresharkPlugin.cmake b/cmake/modules/WiresharkPlugin.cmake index 36d1ebfdfb..04b11377f2 100644 --- a/cmake/modules/WiresharkPlugin.cmake +++ b/cmake/modules/WiresharkPlugin.cmake @@ -50,7 +50,7 @@ macro(ADD_PLUGIN_LIBRARY _plugin) foreach(_config_type ${CMAKE_CONFIGURATION_TYPES}) string(TOUPPER ${_config_type} _config_upper) set_target_properties(${_plugin} PROPERTIES - LIBRARY_OUTPUT_DIRECTORY_${_config_upper} ${CMAKE_BINARY_DIR}/run/${_config_type}/plugins + LIBRARY_OUTPUT_DIRECTORY_${_config_upper} ${CMAKE_BINARY_DIR}/run/${_config_type}/${PLUGIN_VERSION_DIR} ) endforeach() |