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>
This commit is contained in:
João Valverde
João Valverde
parent
a069a4f856
commit
5352ef42f9
@ -1370,19 +1370,19 @@ if(ENABLE_PLUGINS)
|
|||||||
add_custom_target(plugins)
|
add_custom_target(plugins)
|
||||||
set_target_properties(plugins PROPERTIES FOLDER "Plugins")
|
set_target_properties(plugins PROPERTIES FOLDER "Plugins")
|
||||||
set(PLUGIN_SRC_DIRS
|
set(PLUGIN_SRC_DIRS
|
||||||
plugins/docsis
|
plugins/epan/docsis
|
||||||
plugins/ethercat
|
plugins/epan/ethercat
|
||||||
plugins/gryphon
|
plugins/epan/gryphon
|
||||||
plugins/irda
|
plugins/epan/irda
|
||||||
plugins/mate
|
plugins/epan/mate
|
||||||
plugins/opcua
|
plugins/epan/opcua
|
||||||
plugins/profinet
|
plugins/epan/profinet
|
||||||
plugins/stats_tree
|
plugins/epan/stats_tree
|
||||||
plugins/transum
|
plugins/epan/transum
|
||||||
plugins/unistim
|
plugins/epan/unistim
|
||||||
plugins/wimax
|
plugins/epan/wimax
|
||||||
plugins/wimaxasncp
|
plugins/epan/wimaxasncp
|
||||||
plugins/wimaxmacphy
|
plugins/epan/wimaxmacphy
|
||||||
${CUSTOM_PLUGIN_SRC_DIR}
|
${CUSTOM_PLUGIN_SRC_DIR}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@ -40,17 +40,9 @@ macro(ADD_PLUGIN_LIBRARY _plugin _subfolder)
|
|||||||
FOLDER "Plugins"
|
FOLDER "Plugins"
|
||||||
)
|
)
|
||||||
|
|
||||||
if(ENABLE_APPLICATION_BUNDLE)
|
set_target_properties(${_plugin} PROPERTIES
|
||||||
set_target_properties(${_plugin} PROPERTIES
|
LIBRARY_OUTPUT_DIRECTORY ${PLUGIN_DIR}/${_subfolder}
|
||||||
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}
|
|
||||||
)
|
)
|
||||||
endif()
|
|
||||||
|
|
||||||
# Try to force output to ${PLUGIN_DIR} without the configuration
|
# Try to force output to ${PLUGIN_DIR} without the configuration
|
||||||
# type appended. Needed on Windows.
|
# type appended. Needed on Windows.
|
||||||
|
|||||||
26
configure.ac
26
configure.ac
@ -2809,19 +2809,19 @@ AC_CONFIG_FILES(
|
|||||||
packaging/rpm/SPECS/wireshark.spec
|
packaging/rpm/SPECS/wireshark.spec
|
||||||
packaging/wix/Makefile
|
packaging/wix/Makefile
|
||||||
plugins/Makefile
|
plugins/Makefile
|
||||||
plugins/docsis/Makefile
|
plugins/epan/docsis/Makefile
|
||||||
plugins/ethercat/Makefile
|
plugins/epan/ethercat/Makefile
|
||||||
plugins/gryphon/Makefile
|
plugins/epan/gryphon/Makefile
|
||||||
plugins/irda/Makefile
|
plugins/epan/irda/Makefile
|
||||||
plugins/mate/Makefile
|
plugins/epan/mate/Makefile
|
||||||
plugins/opcua/Makefile
|
plugins/epan/opcua/Makefile
|
||||||
plugins/profinet/Makefile
|
plugins/epan/profinet/Makefile
|
||||||
plugins/stats_tree/Makefile
|
plugins/epan/stats_tree/Makefile
|
||||||
plugins/transum/Makefile
|
plugins/epan/transum/Makefile
|
||||||
plugins/unistim/Makefile
|
plugins/epan/unistim/Makefile
|
||||||
plugins/wimax/Makefile
|
plugins/epan/wimax/Makefile
|
||||||
plugins/wimaxasncp/Makefile
|
plugins/epan/wimaxasncp/Makefile
|
||||||
plugins/wimaxmacphy/Makefile
|
plugins/epan/wimaxmacphy/Makefile
|
||||||
_CUSTOM_PLUGIN_CONFIG_FILES_
|
_CUSTOM_PLUGIN_CONFIG_FILES_
|
||||||
randpkt_core/doxygen.cfg
|
randpkt_core/doxygen.cfg
|
||||||
randpkt_core/Makefile
|
randpkt_core/Makefile
|
||||||
|
|||||||
@ -1,3 +1,3 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
m4_define([_CUSTOM_PLUGIN_CONFIG_FILES_], [plugins/foo/Makefile])
|
m4_define([_CUSTOM_PLUGIN_CONFIG_FILES_], [plugins/epan/foo/Makefile])
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
_CUSTOM_SUBDIRS_ = \
|
_CUSTOM_SUBDIRS_ = \
|
||||||
foo
|
epan/foo
|
||||||
|
|
||||||
_CUSTOM_EXTRA_DIST_ = \
|
_CUSTOM_EXTRA_DIST_ = \
|
||||||
Custom.m4 \
|
Custom.m4 \
|
||||||
|
|||||||
@ -23,19 +23,19 @@
|
|||||||
|
|
||||||
SUBDIRS = \
|
SUBDIRS = \
|
||||||
$(_CUSTOM_SUBDIRS_) \
|
$(_CUSTOM_SUBDIRS_) \
|
||||||
docsis \
|
epan/docsis \
|
||||||
ethercat \
|
epan/ethercat \
|
||||||
gryphon \
|
epan/gryphon \
|
||||||
irda \
|
epan/irda \
|
||||||
mate \
|
epan/mate \
|
||||||
opcua \
|
epan/opcua \
|
||||||
profinet \
|
epan/profinet \
|
||||||
stats_tree \
|
epan/stats_tree \
|
||||||
transum \
|
epan/transum \
|
||||||
unistim \
|
epan/unistim \
|
||||||
wimax \
|
epan/wimax \
|
||||||
wimaxasncp \
|
epan/wimaxasncp \
|
||||||
wimaxmacphy
|
epan/wimaxmacphy
|
||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
$(_CUSTOM_EXTRA_DIST_) \
|
$(_CUSTOM_EXTRA_DIST_) \
|
||||||
|
|||||||
@ -19,7 +19,7 @@
|
|||||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
|
||||||
include $(top_srcdir)/Makefile.am.inc
|
include $(top_srcdir)/Makefile.am.inc
|
||||||
include ../Makefile.am.inc
|
include $(top_srcdir)/plugins/Makefile.am.inc
|
||||||
|
|
||||||
# the name of the plugin
|
# the name of the plugin
|
||||||
PLUGIN_NAME = docsis
|
PLUGIN_NAME = docsis
|
||||||
@ -19,7 +19,7 @@
|
|||||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
|
||||||
include $(top_srcdir)/Makefile.am.inc
|
include $(top_srcdir)/Makefile.am.inc
|
||||||
include ../Makefile.am.inc
|
include $(top_srcdir)/plugins/Makefile.am.inc
|
||||||
|
|
||||||
# the name of the plugin
|
# the name of the plugin
|
||||||
PLUGIN_NAME = ethercat
|
PLUGIN_NAME = ethercat
|
||||||
@ -19,7 +19,7 @@
|
|||||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
|
||||||
include $(top_srcdir)/Makefile.am.inc
|
include $(top_srcdir)/Makefile.am.inc
|
||||||
include ../Makefile.am.inc
|
include $(top_srcdir)/plugins/Makefile.am.inc
|
||||||
|
|
||||||
# the name of the plugin
|
# the name of the plugin
|
||||||
PLUGIN_NAME = gryphon
|
PLUGIN_NAME = gryphon
|
||||||
@ -19,7 +19,7 @@
|
|||||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
|
||||||
include $(top_srcdir)/Makefile.am.inc
|
include $(top_srcdir)/Makefile.am.inc
|
||||||
include ../Makefile.am.inc
|
include $(top_srcdir)/plugins/Makefile.am.inc
|
||||||
|
|
||||||
# the name of the plugin
|
# the name of the plugin
|
||||||
PLUGIN_NAME = irda
|
PLUGIN_NAME = irda
|
||||||
@ -19,7 +19,7 @@
|
|||||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
|
||||||
include $(top_srcdir)/Makefile.am.inc
|
include $(top_srcdir)/Makefile.am.inc
|
||||||
include ../Makefile.am.inc
|
include $(top_srcdir)/plugins/Makefile.am.inc
|
||||||
|
|
||||||
# the name of the plugin
|
# the name of the plugin
|
||||||
PLUGIN_NAME = mate
|
PLUGIN_NAME = mate
|
||||||
@ -20,7 +20,7 @@
|
|||||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
|
||||||
include $(top_srcdir)/Makefile.am.inc
|
include $(top_srcdir)/Makefile.am.inc
|
||||||
include ../Makefile.am.inc
|
include $(top_srcdir)/plugins/Makefile.am.inc
|
||||||
|
|
||||||
# the name of the plugin
|
# the name of the plugin
|
||||||
PLUGIN_NAME = opcua
|
PLUGIN_NAME = opcua
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user