From 67072286bf8bd0aa2dee81953cc2ce08ea8d3dbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Mayer?= Date: Wed, 24 Feb 2010 22:32:10 +0000 Subject: - Remove the lib prefix for plugin names. - Remove a (resolved) comment. - Add a commented out line how to add version infos to the plugin's file name. svn path=/trunk/; revision=31995 --- plugins/asn1/CMakeLists.txt | 6 ++---- plugins/docsis/CMakeLists.txt | 7 +++---- plugins/ethercat/CMakeLists.txt | 7 +++---- plugins/giop/CMakeLists.txt | 12 ++++++++---- plugins/gryphon/CMakeLists.txt | 6 ++---- plugins/irda/CMakeLists.txt | 6 ++---- plugins/m2m/CMakeLists.txt | 6 ++---- plugins/mate/CMakeLists.txt | 6 ++---- plugins/opcua/CMakeLists.txt | 6 ++---- plugins/profinet/CMakeLists.txt | 6 ++---- plugins/sercosiii/CMakeLists.txt | 6 ++---- plugins/stats_tree/CMakeLists.txt | 6 ++---- plugins/tpg/CMakeLists.txt | 6 ++---- plugins/unistim/CMakeLists.txt | 6 ++---- plugins/wimax/CMakeLists.txt | 6 ++---- plugins/wimaxasncp/CMakeLists.txt | 6 ++---- 16 files changed, 40 insertions(+), 64 deletions(-) (limited to 'plugins') diff --git a/plugins/asn1/CMakeLists.txt b/plugins/asn1/CMakeLists.txt index 42b7a6c811..0c6c73243b 100644 --- a/plugins/asn1/CMakeLists.txt +++ b/plugins/asn1/CMakeLists.txt @@ -54,13 +54,11 @@ register_dissector_files(plugin.c ${DISSECTOR_SRC} ) -# todo -# Do I need any of this or is this handled by type MODULE? -# asn1_la_LDFLAGS = -module -avoid-version - add_library(asn1 ${LINK_MODE_MODULE} ${PLUGIN_FILES} ) +set_target_properties(asn1 PROPERTIES PREFIX "") +#set_target_properties(asn1 PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION}) target_link_libraries(asn1 epan) diff --git a/plugins/docsis/CMakeLists.txt b/plugins/docsis/CMakeLists.txt index 6894c05cf7..2847468e54 100644 --- a/plugins/docsis/CMakeLists.txt +++ b/plugins/docsis/CMakeLists.txt @@ -83,13 +83,12 @@ register_dissector_files(plugin.c ${DISSECTOR_SRC} ) -# todo -# Do I need any of this or is this handled by type MODULE? -# asn1_la_LDFLAGS = -module -avoid-version - add_library(docsis ${LINK_MODE_MODULE} ${PLUGIN_FILES} ) +set_target_properties(docsis PROPERTIES PREFIX "") +#set_target_properties(docsis PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION}) + target_link_libraries(docsis epan) diff --git a/plugins/ethercat/CMakeLists.txt b/plugins/ethercat/CMakeLists.txt index 8bbcddb6bc..e50ccd87fb 100644 --- a/plugins/ethercat/CMakeLists.txt +++ b/plugins/ethercat/CMakeLists.txt @@ -55,13 +55,12 @@ register_dissector_files(plugin.c ${DISSECTOR_SRC} ) -# todo -# Do I need any of this or is this handled by type MODULE? -# asn1_la_LDFLAGS = -module -avoid-version - add_library(ethercat ${LINK_MODE_MODULE} ${PLUGIN_FILES} ) +set_target_properties(ethercat PROPERTIES PREFIX "") +#set_target_properties(ethercat PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION}) + target_link_libraries(ethercat epan) diff --git a/plugins/giop/CMakeLists.txt b/plugins/giop/CMakeLists.txt index 93c3fcfaa6..cc383af6f9 100644 --- a/plugins/giop/CMakeLists.txt +++ b/plugins/giop/CMakeLists.txt @@ -53,13 +53,11 @@ endif() include_directories(${CMAKE_CURRENT_SOURCE_DIR}) -# todo -# Do I need any of this or is this handled by type MODULE? -# asn1_la_LDFLAGS = -module -avoid-version - add_library(cosnaming ${LINK_MODE_MODULE} ${COSNAMING_SRC} ) +set_target_properties(cosnaming PROPERTIES PREFIX "") +#set_target_properties(cosnaming PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION}) target_link_libraries(cosnaming epan) @@ -72,6 +70,8 @@ install(TARGETS cosnaming add_library(coseventcomm ${LINK_MODE_MODULE} ${COSEVENTCOMM_SRC} ) +set_target_properties(coseventcomm PROPERTIES PREFIX "") +#set_target_properties(coseventcomm PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION}) target_link_libraries(coseventcomm epan) @@ -84,6 +84,8 @@ install(TARGETS coseventcomm add_library(tango ${LINK_MODE_MODULE} ${TANGO_SRC} ) +set_target_properties(tango PROPERTIES PREFIX "") +#set_target_properties(tango PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION}) target_link_libraries(tango epan) @@ -96,6 +98,8 @@ install(TARGETS tango add_library(parlay ${LINK_MODE_MODULE} ${PARLAY_SRC} ) +set_target_properties(parlay PROPERTIES PREFIX "") +#set_target_properties(parlay PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION}) target_link_libraries(parlay epan) diff --git a/plugins/gryphon/CMakeLists.txt b/plugins/gryphon/CMakeLists.txt index 1c215fe1e3..f847ffb1d0 100644 --- a/plugins/gryphon/CMakeLists.txt +++ b/plugins/gryphon/CMakeLists.txt @@ -49,13 +49,11 @@ register_dissector_files(plugin.c ${DISSECTOR_SRC} ) -# todo -# Do I need any of this or is this handled by type MODULE? -# asn1_la_LDFLAGS = -module -avoid-version - add_library(gryphon ${LINK_MODE_MODULE} ${PLUGIN_FILES} ) +set_target_properties(gryphon PROPERTIES PREFIX "") +#set_target_properties(gryphon PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION}) target_link_libraries(gryphon epan) diff --git a/plugins/irda/CMakeLists.txt b/plugins/irda/CMakeLists.txt index 89d94c4e41..88aa656c6c 100644 --- a/plugins/irda/CMakeLists.txt +++ b/plugins/irda/CMakeLists.txt @@ -51,13 +51,11 @@ register_dissector_files(plugin.c ${DISSECTOR_SRC} ) -# todo -# Do I need any of this or is this handled by type MODULE? -# asn1_la_LDFLAGS = -module -avoid-version - add_library(irda ${LINK_MODE_MODULE} ${PLUGIN_FILES} ) +set_target_properties(irda PROPERTIES PREFIX "") +#set_target_properties(irda PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION}) target_link_libraries(irda epan) diff --git a/plugins/m2m/CMakeLists.txt b/plugins/m2m/CMakeLists.txt index 28b85b82d5..9878043c31 100644 --- a/plugins/m2m/CMakeLists.txt +++ b/plugins/m2m/CMakeLists.txt @@ -54,13 +54,11 @@ register_dissector_files(plugin.c ${DISSECTOR_SRC} ) -# todo -# Do I need any of this or is this handled by type MODULE? -# asn1_la_LDFLAGS = -module -avoid-version - add_library(m2m ${LINK_MODE_MODULE} ${PLUGIN_FILES} ) +set_target_properties(m2m PROPERTIES PREFIX "") +#set_target_properties(m2m PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION}) target_link_libraries(m2m epan) diff --git a/plugins/mate/CMakeLists.txt b/plugins/mate/CMakeLists.txt index 2ec9f22901..b3c61022df 100644 --- a/plugins/mate/CMakeLists.txt +++ b/plugins/mate/CMakeLists.txt @@ -70,13 +70,11 @@ register_dissector_files(plugin.c ${DISSECTOR_SRC} ) -# todo -# Do I need any of this or is this handled by type MODULE? -# asn1_la_LDFLAGS = -module -avoid-version - add_library(mate ${LINK_MODE_MODULE} ${PLUGIN_FILES} ) +set_target_properties(mate PROPERTIES PREFIX "") +#set_target_properties(mate PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION}) target_link_libraries(mate epan) diff --git a/plugins/opcua/CMakeLists.txt b/plugins/opcua/CMakeLists.txt index 1da79d3415..bfc4ae0cee 100644 --- a/plugins/opcua/CMakeLists.txt +++ b/plugins/opcua/CMakeLists.txt @@ -62,13 +62,11 @@ register_dissector_files(plugin.c ${DISSECTOR_SRC} ) -# todo -# Do I need any of this or is this handled by type MODULE? -# asn1_la_LDFLAGS = -module -avoid-version - add_library(opcua ${LINK_MODE_MODULE} ${PLUGIN_FILES} ) +set_target_properties(opcua PROPERTIES PREFIX "") +#set_target_properties(opcua PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION}) target_link_libraries(opcua epan) diff --git a/plugins/profinet/CMakeLists.txt b/plugins/profinet/CMakeLists.txt index 6288f717a1..704dec9e03 100644 --- a/plugins/profinet/CMakeLists.txt +++ b/plugins/profinet/CMakeLists.txt @@ -61,13 +61,11 @@ register_dissector_files(plugin.c ${DISSECTOR_SRC} ) -# todo -# Do I need any of this or is this handled by type MODULE? -# asn1_la_LDFLAGS = -module -avoid-version - add_library(profinet ${LINK_MODE_MODULE} ${PLUGIN_FILES} ) +set_target_properties(profinet PROPERTIES PREFIX "") +#set_target_properties(profinet PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION}) target_link_libraries(profinet epan) diff --git a/plugins/sercosiii/CMakeLists.txt b/plugins/sercosiii/CMakeLists.txt index 0d2c2e11ab..e1b2a8eac4 100644 --- a/plugins/sercosiii/CMakeLists.txt +++ b/plugins/sercosiii/CMakeLists.txt @@ -60,13 +60,11 @@ register_dissector_files(plugin.c ${DISSECTOR_SRC} ) -# todo -# Do I need any of this or is this handled by type MODULE? -# asn1_la_LDFLAGS = -module -avoid-version - add_library(sercosiii ${LINK_MODE_MODULE} ${PLUGIN_FILES} ) +set_target_properties(sercosiii PROPERTIES PREFIX "") +#set_target_properties(sercosiii PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION}) target_link_libraries(sercosiii epan) diff --git a/plugins/stats_tree/CMakeLists.txt b/plugins/stats_tree/CMakeLists.txt index 6011f20d13..d608e4f847 100644 --- a/plugins/stats_tree/CMakeLists.txt +++ b/plugins/stats_tree/CMakeLists.txt @@ -38,13 +38,11 @@ if (WERROR) ) endif() -# todo -# Do I need any of this or is this handled by type MODULE? -# asn1_la_LDFLAGS = -module -avoid-version - add_library(stats_tree ${LINK_MODE_MODULE} ${TAP_SRC} ) +set_target_properties(stats_tree PROPERTIES PREFIX "") +#set_target_properties(stats_tree PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION}) target_link_libraries(stats_tree epan) diff --git a/plugins/tpg/CMakeLists.txt b/plugins/tpg/CMakeLists.txt index e51ff4cc69..68086a0abd 100644 --- a/plugins/tpg/CMakeLists.txt +++ b/plugins/tpg/CMakeLists.txt @@ -70,13 +70,11 @@ ADD_CUSTOM_COMMAND( ${CMAKE_CURRENT_SOURCE_DIR}/http.tpg ) -# todo -# Do I need any of this or is this handled by type MODULE? -# asn1_la_LDFLAGS = -module -avoid-version - add_library(tpg ${LINK_MODE_MODULE} ${PLUGIN_FILES} ) +set_target_properties(tpg PROPERTIES PREFIX "") +#set_target_properties(tpg PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION}) target_link_libraries(tpg epan) diff --git a/plugins/unistim/CMakeLists.txt b/plugins/unistim/CMakeLists.txt index 2d865a0829..78e2eb78e0 100644 --- a/plugins/unistim/CMakeLists.txt +++ b/plugins/unistim/CMakeLists.txt @@ -49,13 +49,11 @@ register_dissector_files(plugin.c ${DISSECTOR_SRC} ) -# todo -# Do I need any of this or is this handled by type MODULE? -# unistim_la_LDFLAGS = -module -avoid-version - add_library(unistim ${LINK_MODE_MODULE} ${PLUGIN_FILES} ) +set_target_properties(unistim PROPERTIES PREFIX "") +#set_target_properties(unistim PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION}) target_link_libraries(unistim epan) diff --git a/plugins/wimax/CMakeLists.txt b/plugins/wimax/CMakeLists.txt index 73a201a831..a2fd7d9007 100644 --- a/plugins/wimax/CMakeLists.txt +++ b/plugins/wimax/CMakeLists.txt @@ -94,13 +94,11 @@ register_dissector_files(plugin.c ${DISSECTOR_SRC} ) -# todo -# Do I need any of this or is this handled by type MODULE? -# wimax_la_LDFLAGS = -module -avoid-version - add_library(wimax ${LINK_MODE_MODULE} ${PLUGIN_FILES} ) +set_target_properties(wimax PROPERTIES PREFIX "") +#set_target_properties(wimax PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION}) target_link_libraries(wimax epan) diff --git a/plugins/wimaxasncp/CMakeLists.txt b/plugins/wimaxasncp/CMakeLists.txt index 33592870df..737dbb7939 100644 --- a/plugins/wimaxasncp/CMakeLists.txt +++ b/plugins/wimaxasncp/CMakeLists.txt @@ -53,13 +53,11 @@ register_dissector_files(plugin.c ${DISSECTOR_SRC} ) -# todo -# Do I need any of this or is this handled by type MODULE? -# wimaxasncp_la_LDFLAGS = -module -avoid-version - add_library(wimaxasncp ${LINK_MODE_MODULE} ${PLUGIN_FILES} ) +set_target_properties(wimaxasncp PROPERTIES PREFIX "") +#set_target_properties(wimaxasncp PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION}) target_link_libraries(wimaxasncp epan) -- cgit v1.2.3