diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2018-01-15 12:40:55 +0000 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2018-01-16 08:51:37 +0000 |
| commit | 5352ef42f94b5c14a24eb2e5559440c71fdcae8f (patch) | |
| tree | 22901b1d228d76360b22af10021564bcee36390e /cmake/modules/WiresharkPlugin.cmake | |
| parent | a069a4f856c29b25bae05f2a91d7b2b71e1905f3 (diff) | |
plugins: Add source tree subfolder for plugin library
This allows some simplification and makes things more consistent,
particularly for loading plugins from the build dir.
Also fixes the issue reported here:
https://www.wireshark.org/lists/wireshark-dev/201801/msg00061.html
Change-Id: I0d8a000ee679172bccad546a3b0c47a79486f44d
Reviewed-on: https://code.wireshark.org/review/25329
Petri-Dish: João Valverde <j@v6e.pt>
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'cmake/modules/WiresharkPlugin.cmake')
| -rw-r--r-- | cmake/modules/WiresharkPlugin.cmake | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/cmake/modules/WiresharkPlugin.cmake b/cmake/modules/WiresharkPlugin.cmake index 23db9b30c7..0cf67debcd 100644 --- a/cmake/modules/WiresharkPlugin.cmake +++ b/cmake/modules/WiresharkPlugin.cmake @@ -40,17 +40,9 @@ macro(ADD_PLUGIN_LIBRARY _plugin _subfolder) FOLDER "Plugins" ) - if(ENABLE_APPLICATION_BUNDLE) - set_target_properties(${_plugin} PROPERTIES - LIBRARY_OUTPUT_DIRECTORY ${PLUGIN_DIR}/${_subfolder} - ) - else() - # Why don't we just write to ${PLUGIN_DIR}/${_subfolder} - # everywhere? - set_target_properties(${_plugin} PROPERTIES - LIBRARY_OUTPUT_DIRECTORY ${PLUGIN_DIR} + set_target_properties(${_plugin} PROPERTIES + LIBRARY_OUTPUT_DIRECTORY ${PLUGIN_DIR}/${_subfolder} ) -endif() # Try to force output to ${PLUGIN_DIR} without the configuration # type appended. Needed on Windows. |