aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2014-10-09 16:41:37 -0700
committerGerald Combs <gerald@wireshark.org>2014-10-09 23:57:43 +0000
commitbea24cfdad15fd1842ee9cc2db56b97d74b0fafe (patch)
tree51b4fa8b2fb3504485637d8e8e1b44cc02d6032b
parent45e462985db891248ffcb9db21e6b66733de0b84 (diff)
CMake: Bundle our plugins.
plugins/*/CMakeLists.txt has a lot of repitition. We might want to create a module or include file to simplify things. Change-Id: Iadd453c286a4127beacd80edf6dc200aa9148852 Reviewed-on: https://code.wireshark.org/review/4582 Reviewed-by: Gerald Combs <gerald@wireshark.org>
-rw-r--r--plugins/docsis/CMakeLists.txt15
-rw-r--r--plugins/ethercat/CMakeLists.txt15
-rw-r--r--plugins/gryphon/CMakeLists.txt15
-rw-r--r--plugins/irda/CMakeLists.txt15
-rw-r--r--plugins/m2m/CMakeLists.txt15
-rw-r--r--plugins/mate/CMakeLists.txt15
-rw-r--r--plugins/opcua/CMakeLists.txt15
-rw-r--r--plugins/profinet/CMakeLists.txt15
-rw-r--r--plugins/stats_tree/CMakeLists.txt15
-rw-r--r--plugins/tpg/CMakeLists.txt15
-rw-r--r--plugins/unistim/CMakeLists.txt15
-rw-r--r--plugins/wimax/CMakeLists.txt15
-rw-r--r--plugins/wimaxasncp/CMakeLists.txt15
-rw-r--r--plugins/wimaxmacphy/CMakeLists.txt15
14 files changed, 168 insertions, 42 deletions
diff --git a/plugins/docsis/CMakeLists.txt b/plugins/docsis/CMakeLists.txt
index 8503d6cd83..9d9a5aac8f 100644
--- a/plugins/docsis/CMakeLists.txt
+++ b/plugins/docsis/CMakeLists.txt
@@ -94,9 +94,18 @@ add_library(docsis ${LINK_MODE_MODULE}
${PLUGIN_FILES}
plugin.rc
)
-set_target_properties(docsis PROPERTIES PREFIX "")
-set_target_properties(docsis PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
-set_target_properties(docsis PROPERTIES FOLDER "Plugins")
+
+set_target_properties(docsis PROPERTIES
+ PREFIX ""
+ LINK_FLAGS "${WS_LINK_FLAGS}"
+ FOLDER "Plugins"
+)
+
+if(ENABLE_APPLICATION_BUNDLE)
+ set_target_properties(docsis PROPERTIES
+ LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/run/Wireshark.app/Contents/PlugIns/wireshark
+ )
+endif()
target_link_libraries(docsis epan)
diff --git a/plugins/ethercat/CMakeLists.txt b/plugins/ethercat/CMakeLists.txt
index a77384c820..46d7a00622 100644
--- a/plugins/ethercat/CMakeLists.txt
+++ b/plugins/ethercat/CMakeLists.txt
@@ -57,9 +57,18 @@ add_library(ethercat ${LINK_MODE_MODULE}
${PLUGIN_FILES}
plugin.rc
)
-set_target_properties(ethercat PROPERTIES PREFIX "")
-set_target_properties(ethercat PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
-set_target_properties(ethercat PROPERTIES FOLDER "Plugins")
+
+set_target_properties(ethercat PROPERTIES
+ PREFIX ""
+ LINK_FLAGS "${WS_LINK_FLAGS}"
+ FOLDER "Plugins"
+)
+
+if(ENABLE_APPLICATION_BUNDLE)
+ set_target_properties(ethercat PROPERTIES
+ LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/run/Wireshark.app/Contents/PlugIns/wireshark
+ )
+endif()
target_link_libraries(ethercat epan)
diff --git a/plugins/gryphon/CMakeLists.txt b/plugins/gryphon/CMakeLists.txt
index fdf9a51b4f..22eeae68af 100644
--- a/plugins/gryphon/CMakeLists.txt
+++ b/plugins/gryphon/CMakeLists.txt
@@ -51,9 +51,18 @@ add_library(gryphon ${LINK_MODE_MODULE}
${PLUGIN_FILES}
plugin.rc
)
-set_target_properties(gryphon PROPERTIES PREFIX "")
-set_target_properties(gryphon PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
-set_target_properties(gryphon PROPERTIES FOLDER "Plugins")
+
+set_target_properties(gryphon PROPERTIES
+ PREFIX ""
+ LINK_FLAGS "${WS_LINK_FLAGS}"
+ FOLDER "Plugins"
+)
+
+if(ENABLE_APPLICATION_BUNDLE)
+ set_target_properties(gryphon PROPERTIES
+ LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/run/Wireshark.app/Contents/PlugIns/wireshark
+ )
+endif()
target_link_libraries(gryphon epan)
diff --git a/plugins/irda/CMakeLists.txt b/plugins/irda/CMakeLists.txt
index 551e537f6f..aa7d891fa5 100644
--- a/plugins/irda/CMakeLists.txt
+++ b/plugins/irda/CMakeLists.txt
@@ -53,9 +53,18 @@ add_library(irda ${LINK_MODE_MODULE}
${PLUGIN_FILES}
plugin.rc
)
-set_target_properties(irda PROPERTIES PREFIX "")
-set_target_properties(irda PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
-set_target_properties(irda PROPERTIES FOLDER "Plugins")
+
+set_target_properties(irda PROPERTIES
+ PREFIX ""
+ LINK_FLAGS "${WS_LINK_FLAGS}"
+ FOLDER "Plugins"
+)
+
+if(ENABLE_APPLICATION_BUNDLE)
+ set_target_properties(irda PROPERTIES
+ LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/run/Wireshark.app/Contents/PlugIns/wireshark
+ )
+endif()
target_link_libraries(irda epan)
diff --git a/plugins/m2m/CMakeLists.txt b/plugins/m2m/CMakeLists.txt
index 4dda097b15..6a779b909b 100644
--- a/plugins/m2m/CMakeLists.txt
+++ b/plugins/m2m/CMakeLists.txt
@@ -56,9 +56,18 @@ add_library(m2m ${LINK_MODE_MODULE}
${PLUGIN_FILES}
plugin.rc
)
-set_target_properties(m2m PROPERTIES PREFIX "")
-set_target_properties(m2m PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
-set_target_properties(m2m PROPERTIES FOLDER "Plugins")
+
+set_target_properties(m2m PROPERTIES
+ PREFIX ""
+ LINK_FLAGS "${WS_LINK_FLAGS}"
+ FOLDER "Plugins"
+)
+
+if(ENABLE_APPLICATION_BUNDLE)
+ set_target_properties(m2m PROPERTIES
+ LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/run/Wireshark.app/Contents/PlugIns/wireshark
+ )
+endif()
target_link_libraries(m2m epan)
diff --git a/plugins/mate/CMakeLists.txt b/plugins/mate/CMakeLists.txt
index 28c41f296a..e4dc6fe3b9 100644
--- a/plugins/mate/CMakeLists.txt
+++ b/plugins/mate/CMakeLists.txt
@@ -72,9 +72,18 @@ add_library(mate ${LINK_MODE_MODULE}
${PLUGIN_FILES}
plugin.rc
)
-set_target_properties(mate PROPERTIES PREFIX "")
-set_target_properties(mate PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
-set_target_properties(mate PROPERTIES FOLDER "Plugins")
+
+set_target_properties(mate PROPERTIES
+ PREFIX ""
+ LINK_FLAGS "${WS_LINK_FLAGS}"
+ FOLDER "Plugins"
+)
+
+if(ENABLE_APPLICATION_BUNDLE)
+ set_target_properties(mate PROPERTIES
+ LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/run/Wireshark.app/Contents/PlugIns/wireshark
+ )
+endif()
target_link_libraries(mate epan)
diff --git a/plugins/opcua/CMakeLists.txt b/plugins/opcua/CMakeLists.txt
index 281e8cb0cd..a25e0fdfa7 100644
--- a/plugins/opcua/CMakeLists.txt
+++ b/plugins/opcua/CMakeLists.txt
@@ -66,9 +66,18 @@ add_library(opcua ${LINK_MODE_MODULE}
${PLUGIN_FILES}
plugin.rc
)
-set_target_properties(opcua PROPERTIES PREFIX "")
-set_target_properties(opcua PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
-set_target_properties(opcua PROPERTIES FOLDER "Plugins")
+
+set_target_properties(opcua PROPERTIES
+ PREFIX ""
+ LINK_FLAGS "${WS_LINK_FLAGS}"
+ FOLDER "Plugins"
+)
+
+if(ENABLE_APPLICATION_BUNDLE)
+ set_target_properties(opcua PROPERTIES
+ LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/run/Wireshark.app/Contents/PlugIns/wireshark
+ )
+endif()
target_link_libraries(opcua epan)
diff --git a/plugins/profinet/CMakeLists.txt b/plugins/profinet/CMakeLists.txt
index 48c2a2b7c4..48d1791424 100644
--- a/plugins/profinet/CMakeLists.txt
+++ b/plugins/profinet/CMakeLists.txt
@@ -63,9 +63,18 @@ add_library(profinet ${LINK_MODE_MODULE}
${PLUGIN_FILES}
plugin.rc
)
-set_target_properties(profinet PROPERTIES PREFIX "")
-set_target_properties(profinet PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
-set_target_properties(profinet PROPERTIES FOLDER "Plugins")
+
+set_target_properties(profinet PROPERTIES
+ PREFIX ""
+ LINK_FLAGS "${WS_LINK_FLAGS}"
+ FOLDER "Plugins"
+)
+
+if(ENABLE_APPLICATION_BUNDLE)
+ set_target_properties(profinet PROPERTIES
+ LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/run/Wireshark.app/Contents/PlugIns/wireshark
+ )
+endif()
target_link_libraries(profinet epan)
diff --git a/plugins/stats_tree/CMakeLists.txt b/plugins/stats_tree/CMakeLists.txt
index e8dfdae13c..dfe20daaa2 100644
--- a/plugins/stats_tree/CMakeLists.txt
+++ b/plugins/stats_tree/CMakeLists.txt
@@ -40,9 +40,18 @@ add_library(stats_tree ${LINK_MODE_MODULE}
${TAP_SRC}
plugin.rc
)
-set_target_properties(stats_tree PROPERTIES PREFIX "")
-set_target_properties(stats_tree PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
-set_target_properties(stats_tree PROPERTIES FOLDER "Plugins")
+
+set_target_properties(stats_tree PROPERTIES
+ PREFIX ""
+ LINK_FLAGS "${WS_LINK_FLAGS}"
+ FOLDER "Plugins"
+)
+
+if(ENABLE_APPLICATION_BUNDLE)
+ set_target_properties(stats_tree PROPERTIES
+ LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/run/Wireshark.app/Contents/PlugIns/wireshark
+ )
+endif()
target_link_libraries(stats_tree epan)
diff --git a/plugins/tpg/CMakeLists.txt b/plugins/tpg/CMakeLists.txt
index 066f68f300..91c1f7a6cd 100644
--- a/plugins/tpg/CMakeLists.txt
+++ b/plugins/tpg/CMakeLists.txt
@@ -71,9 +71,18 @@ add_library(tpg ${LINK_MODE_MODULE}
${PLUGIN_FILES}
plugin.rc
)
-set_target_properties(tpg PROPERTIES PREFIX "")
-set_target_properties(tpg PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
-set_target_properties(tpg PROPERTIES FOLDER "Plugins")
+
+set_target_properties(tpg PROPERTIES
+ PREFIX ""
+ LINK_FLAGS "${WS_LINK_FLAGS}"
+ FOLDER "Plugins"
+)
+
+if(ENABLE_APPLICATION_BUNDLE)
+ set_target_properties(tpg PROPERTIES
+ LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/run/Wireshark.app/Contents/PlugIns/wireshark
+ )
+endif()
target_link_libraries(tpg epan)
diff --git a/plugins/unistim/CMakeLists.txt b/plugins/unistim/CMakeLists.txt
index 1f8cf08715..d6b678bdcd 100644
--- a/plugins/unistim/CMakeLists.txt
+++ b/plugins/unistim/CMakeLists.txt
@@ -51,9 +51,18 @@ add_library(unistim ${LINK_MODE_MODULE}
${PLUGIN_FILES}
plugin.rc
)
-set_target_properties(unistim PROPERTIES PREFIX "")
-set_target_properties(unistim PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
-set_target_properties(unistim PROPERTIES FOLDER "Plugins")
+
+set_target_properties(unistim PROPERTIES
+ PREFIX ""
+ LINK_FLAGS "${WS_LINK_FLAGS}"
+ FOLDER "Plugins"
+)
+
+if(ENABLE_APPLICATION_BUNDLE)
+ set_target_properties(unistim PROPERTIES
+ LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/run/Wireshark.app/Contents/PlugIns/wireshark
+ )
+endif()
target_link_libraries(unistim epan)
diff --git a/plugins/wimax/CMakeLists.txt b/plugins/wimax/CMakeLists.txt
index 32c5b07dd3..6b2e1ea4e0 100644
--- a/plugins/wimax/CMakeLists.txt
+++ b/plugins/wimax/CMakeLists.txt
@@ -96,9 +96,18 @@ add_library(wimax ${LINK_MODE_MODULE}
${PLUGIN_FILES}
plugin.rc
)
-set_target_properties(wimax PROPERTIES PREFIX "")
-set_target_properties(wimax PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
-set_target_properties(wimax PROPERTIES FOLDER "Plugins")
+
+set_target_properties(wimax PROPERTIES
+ PREFIX ""
+ LINK_FLAGS "${WS_LINK_FLAGS}"
+ FOLDER "Plugins"
+)
+
+if(ENABLE_APPLICATION_BUNDLE)
+ set_target_properties(wimax PROPERTIES
+ LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/run/Wireshark.app/Contents/PlugIns/wireshark
+ )
+endif()
target_link_libraries(wimax epan)
diff --git a/plugins/wimaxasncp/CMakeLists.txt b/plugins/wimaxasncp/CMakeLists.txt
index da0ee523dc..0022b57d29 100644
--- a/plugins/wimaxasncp/CMakeLists.txt
+++ b/plugins/wimaxasncp/CMakeLists.txt
@@ -55,9 +55,18 @@ add_library(wimaxasncp ${LINK_MODE_MODULE}
${PLUGIN_FILES}
plugin.rc
)
-set_target_properties(wimaxasncp PROPERTIES PREFIX "")
-set_target_properties(wimaxasncp PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
-set_target_properties(wimaxasncp PROPERTIES FOLDER "Plugins")
+
+set_target_properties(wimaxasncp PROPERTIES
+ PREFIX ""
+ LINK_FLAGS "${WS_LINK_FLAGS}"
+ FOLDER "Plugins"
+)
+
+if(ENABLE_APPLICATION_BUNDLE)
+ set_target_properties(wimaxasncp PROPERTIES
+ LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/run/Wireshark.app/Contents/PlugIns/wireshark
+ )
+endif()
target_link_libraries(wimaxasncp epan)
diff --git a/plugins/wimaxmacphy/CMakeLists.txt b/plugins/wimaxmacphy/CMakeLists.txt
index b4d50eb729..f524915208 100644
--- a/plugins/wimaxmacphy/CMakeLists.txt
+++ b/plugins/wimaxmacphy/CMakeLists.txt
@@ -51,9 +51,18 @@ add_library(wimaxmacphy ${LINK_MODE_MODULE}
${PLUGIN_FILES}
plugin.rc
)
-set_target_properties(wimaxmacphy PROPERTIES PREFIX "")
-set_target_properties(wimaxmacphy PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
-set_target_properties(wimaxmacphy PROPERTIES FOLDER "Plugins")
+
+set_target_properties(wimaxmacphy PROPERTIES
+ PREFIX ""
+ LINK_FLAGS "${WS_LINK_FLAGS}"
+ FOLDER "Plugins"
+)
+
+if(ENABLE_APPLICATION_BUNDLE)
+ set_target_properties(wimaxmacphy PROPERTIES
+ LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/run/Wireshark.app/Contents/PlugIns/wireshark
+ )
+endif()
target_link_libraries(wimaxmacphy epan)