osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Plugins are not shared libraries, so: 

1) don't set thei SOVERSION - run-time-loaded modules don't have
	   an SOVERSION;

	2) build them with link mode MODULE, not SHARED, on all
	   platforms.

(Fixing 1) also fixes the problem with building them as MODULE on OS X.)

svn path=/trunk/; revision=34243
This commit is contained in:
Guy Harris 2010-09-24 20:41:34 +00:00
parent 9ba7c5f9df
commit ac3ac6c476
18 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -210,11 +210,7 @@ if(ENABLE_STATIC)
set(LINK_MODE_MODULE STATIC)
else()
set(LINK_MODE_LIB SHARED)
if(APPLE)
set(LINK_MODE_MODULE SHARED)
else()
set(LINK_MODE_MODULE MODULE)
endif()
set(LINK_MODE_MODULE SHARED)
endif()
# The packagelist is doing some magic: If we add XXX to the packagelist, we

1
plugins/asn1/CMakeLists.txt
View File

@ -58,7 +58,6 @@ add_library(asn1 ${LINK_MODE_MODULE}
${PLUGIN_FILES}
)
set_target_properties(asn1 PROPERTIES PREFIX "")
set_target_properties(asn1 PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION})
set_target_properties(asn1 PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
target_link_libraries(asn1 epan)

1
plugins/docsis/CMakeLists.txt
View File

@ -87,7 +87,6 @@ add_library(docsis ${LINK_MODE_MODULE}
${PLUGIN_FILES}
)
set_target_properties(docsis PROPERTIES PREFIX "")
set_target_properties(docsis PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION})
set_target_properties(docsis PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
target_link_libraries(docsis epan)

1
plugins/ethercat/CMakeLists.txt
View File

@ -59,7 +59,6 @@ add_library(ethercat ${LINK_MODE_MODULE}
${PLUGIN_FILES}
)
set_target_properties(ethercat PROPERTIES PREFIX "")
set_target_properties(ethercat PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION})
set_target_properties(ethercat PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
target_link_libraries(ethercat epan)

4
plugins/giop/CMakeLists.txt
View File

@ -57,7 +57,6 @@ add_library(cosnaming ${LINK_MODE_MODULE}
${COSNAMING_SRC}
)
set_target_properties(cosnaming PROPERTIES PREFIX "")
set_target_properties(cosnaming PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION})
set_target_properties(cosnaming PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
target_link_libraries(cosnaming epan)
@ -72,7 +71,6 @@ add_library(coseventcomm ${LINK_MODE_MODULE}
${COSEVENTCOMM_SRC}
)
set_target_properties(coseventcomm PROPERTIES PREFIX "")
set_target_properties(coseventcomm PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION})
set_target_properties(coseventcomm PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
target_link_libraries(coseventcomm epan)
@ -87,7 +85,6 @@ add_library(tango ${LINK_MODE_MODULE}
${TANGO_SRC}
)
set_target_properties(tango PROPERTIES PREFIX "")
set_target_properties(tango PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION})
set_target_properties(tango PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
target_link_libraries(tango epan)
@ -102,7 +99,6 @@ add_library(parlay ${LINK_MODE_MODULE}
${PARLAY_SRC}
)
set_target_properties(parlay PROPERTIES PREFIX "")
set_target_properties(parlay PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION})
set_target_properties(parlay PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
target_link_libraries(parlay epan)

1
plugins/gryphon/CMakeLists.txt
View File

@ -53,7 +53,6 @@ add_library(gryphon ${LINK_MODE_MODULE}
${PLUGIN_FILES}
)
set_target_properties(gryphon PROPERTIES PREFIX "")
set_target_properties(gryphon PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION})
set_target_properties(gryphon PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
target_link_libraries(gryphon epan)

1
plugins/interlink/CMakeLists.txt
View File

@ -53,7 +53,6 @@ add_library(interlink ${LINK_MODE_MODULE}
${PLUGIN_FILES}
)
set_target_properties(interlink PROPERTIES PREFIX "")
set_target_properties(interlink PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION})
set_target_properties(interlink PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
target_link_libraries(interlink epan)

1
plugins/irda/CMakeLists.txt
View File

@ -55,7 +55,6 @@ add_library(irda ${LINK_MODE_MODULE}
${PLUGIN_FILES}
)
set_target_properties(irda PROPERTIES PREFIX "")
set_target_properties(irda PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION})
set_target_properties(irda PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
target_link_libraries(irda epan)

1
plugins/m2m/CMakeLists.txt
View File

@ -58,7 +58,6 @@ add_library(m2m ${LINK_MODE_MODULE}
${PLUGIN_FILES}
)
set_target_properties(m2m PROPERTIES PREFIX "")
set_target_properties(m2m PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION})
set_target_properties(m2m PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
target_link_libraries(m2m epan)

1
plugins/mate/CMakeLists.txt
View File

@ -74,7 +74,6 @@ add_library(mate ${LINK_MODE_MODULE}
${PLUGIN_FILES}
)
set_target_properties(mate PROPERTIES PREFIX "")
set_target_properties(mate PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION})
set_target_properties(mate PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
target_link_libraries(mate epan)

1
plugins/opcua/CMakeLists.txt
View File

@ -66,7 +66,6 @@ add_library(opcua ${LINK_MODE_MODULE}
${PLUGIN_FILES}
)
set_target_properties(opcua PROPERTIES PREFIX "")
set_target_properties(opcua PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION})
set_target_properties(opcua PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
target_link_libraries(opcua epan)

1
plugins/profinet/CMakeLists.txt
View File

@ -65,7 +65,6 @@ add_library(profinet ${LINK_MODE_MODULE}
${PLUGIN_FILES}
)
set_target_properties(profinet PROPERTIES PREFIX "")
set_target_properties(profinet PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION})
set_target_properties(profinet PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
target_link_libraries(profinet epan)

1
plugins/sercosiii/CMakeLists.txt
View File

@ -64,7 +64,6 @@ add_library(sercosiii ${LINK_MODE_MODULE}
${PLUGIN_FILES}
)
set_target_properties(sercosiii PROPERTIES PREFIX "")
set_target_properties(sercosiii PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION})
set_target_properties(sercosiii PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
target_link_libraries(sercosiii epan)

1
plugins/stats_tree/CMakeLists.txt
View File

@ -42,7 +42,6 @@ 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})
set_target_properties(stats_tree PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
target_link_libraries(stats_tree epan)

1
plugins/tpg/CMakeLists.txt
View File

@ -74,7 +74,6 @@ add_library(tpg ${LINK_MODE_MODULE}
${PLUGIN_FILES}
)
set_target_properties(tpg PROPERTIES PREFIX "")
set_target_properties(tpg PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION})
set_target_properties(tpg PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
target_link_libraries(tpg epan)

1
plugins/unistim/CMakeLists.txt
View File

@ -53,7 +53,6 @@ add_library(unistim ${LINK_MODE_MODULE}
${PLUGIN_FILES}
)
set_target_properties(unistim PROPERTIES PREFIX "")
set_target_properties(unistim PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION})
set_target_properties(unistim PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
target_link_libraries(unistim epan)

1
plugins/wimax/CMakeLists.txt
View File

@ -98,7 +98,6 @@ add_library(wimax ${LINK_MODE_MODULE}
${PLUGIN_FILES}
)
set_target_properties(wimax PROPERTIES PREFIX "")
set_target_properties(wimax PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION})
set_target_properties(wimax PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
target_link_libraries(wimax epan)

1
plugins/wimaxasncp/CMakeLists.txt
View File

@ -57,7 +57,6 @@ add_library(wimaxasncp ${LINK_MODE_MODULE}
${PLUGIN_FILES}
)
set_target_properties(wimaxasncp PROPERTIES PREFIX "")
set_target_properties(wimaxasncp PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION})
set_target_properties(wimaxasncp PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
target_link_libraries(wimaxasncp epan)