aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Mayer <jmayer@loplof.de>2014-06-21 01:33:57 +0200
committerJörg Mayer <jmayer@loplof.de>2014-06-20 23:58:22 +0000
commitc11ae8ac827afa50ef226ebaef134f54ac0e532b (patch)
tree8a26fc121d3c148c06d0ff1a0a5e51296b0b7dd0
parentb2622e1194b9551569bb1ea4bed9e9241516608d (diff)
Add .rc files to the sources to have them included in the build
Change-Id: I84dda519e617b24d92fcf374670a4a6ee6f488ee Reviewed-on: https://code.wireshark.org/review/2506 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
-rw-r--r--CMakeLists.txt12
-rw-r--r--epan/CMakeLists.txt1
-rw-r--r--filetap/CMakeLists.txt1
-rw-r--r--plugins/asn1/CMakeLists.txt1
-rw-r--r--plugins/docsis/CMakeLists.txt1
-rw-r--r--plugins/ethercat/CMakeLists.txt1
-rw-r--r--plugins/gryphon/CMakeLists.txt1
-rw-r--r--plugins/irda/CMakeLists.txt1
-rw-r--r--plugins/m2m/CMakeLists.txt1
-rw-r--r--plugins/mate/CMakeLists.txt1
-rw-r--r--plugins/opcua/CMakeLists.txt1
-rw-r--r--plugins/profinet/CMakeLists.txt1
-rw-r--r--plugins/stats_tree/CMakeLists.txt1
-rw-r--r--plugins/tpg/CMakeLists.txt1
-rw-r--r--plugins/unistim/CMakeLists.txt1
-rw-r--r--plugins/wimax/CMakeLists.txt1
-rw-r--r--plugins/wimaxasncp/CMakeLists.txt1
-rw-r--r--plugins/wimaxmacphy/CMakeLists.txt1
-rw-r--r--wiretap/CMakeLists.txt1
-rw-r--r--wsutil/CMakeLists.txt1
20 files changed, 31 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2a8c1c597b..b83c987481 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -906,6 +906,7 @@ if(WIN32)
ui/win32/console_win32.c
ui/win32/file_dlg_win32.c
ui/win32/print_win32.c
+ image/file_dlg_win32.rc
)
endif()
@@ -1050,6 +1051,7 @@ if( (BUILD_wireshark AND GTK_FOUND) OR (BUILD_qtshark AND QT_FOUND) )
${SHARK_COMMON_CAPTURE_SRC}
${SHARK_COMMON_SRC}
${PLATFORM_UI_SRC}
+ image/wireshark.rc
)
endif()
@@ -1121,6 +1123,7 @@ if(BUILD_tshark)
${TSHARK_TAP_SRC}
${SHARK_COMMON_CAPTURE_SRC}
${SHARK_COMMON_SRC}
+ image/tshark.rc
)
add_executable(tshark ${tshark_FILES})
add_dependencies(tshark gitversion)
@@ -1142,6 +1145,7 @@ if(BUILD_tfshark)
tfshark.c
${TSHARK_TAP_SRC}
${SHARK_COMMON_SRC}
+ image/tfshark.rc
)
add_executable(tfshark ${tfshark_FILES})
add_dependencies(tfshark gitversion)
@@ -1161,6 +1165,7 @@ if(BUILD_rawshark AND PCAP_FOUND)
${SHARK_COMMON_SRC}
rawshark.c
ui/util.c
+ image/rawshark.rc
)
add_executable(rawshark ${rawshark_FILES})
add_dependencies(rawshark gitversion)
@@ -1219,6 +1224,7 @@ if(BUILD_text2pcap)
)
set(text2pcap_FILES
${text2pcap_CLEAN_FILES}
+ image/text2pcap.rc
)
add_lex_files(text2pcap_FILES
text2pcap-scanner.l
@@ -1240,6 +1246,7 @@ if(BUILD_mergecap)
set(mergecap_FILES
mergecap.c
version.h
+ image/mergecap.rc
)
add_executable(mergecap ${mergecap_FILES})
add_dependencies(mergecap gitversion)
@@ -1258,6 +1265,7 @@ if(BUILD_reordercap)
set(reordercap_FILES
reordercap.c
version.h
+ image/reordercap.rc
)
add_executable(reordercap ${reordercap_FILES})
add_dependencies(reordercap gitversion)
@@ -1277,6 +1285,7 @@ if(BUILD_capinfos)
)
set(capinfos_FILES
capinfos.c
+ image/capinfos.rc
)
add_executable(capinfos ${capinfos_FILES})
add_dependencies(capinfos gitversion)
@@ -1295,6 +1304,7 @@ if(BUILD_captype)
)
set(captype_FILES
captype.c
+ image/captype.rc
)
add_executable(captype ${captype_FILES})
add_dependencies(captype gitversion)
@@ -1312,6 +1322,7 @@ if(BUILD_editcap)
)
set(editcap_FILES
editcap.c
+ image/editcap.rc
)
add_executable(editcap ${editcap_FILES})
add_dependencies(editcap gitversion)
@@ -1350,6 +1361,7 @@ if(BUILD_dumpcap AND PCAP_FOUND)
version_info.c
ws80211_utils.c
${PLATFORM_PCAP_SRC}
+ image/dumpcap.rc
)
add_executable(dumpcap ${dumpcap_FILES})
add_dependencies(dumpcap gitversion)
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index a678214dcd..5f353f015e 100644
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -1660,6 +1660,7 @@ add_library(epan ${LINK_MODE_LIB}
${DISSECTOR_FILES}
${DISSECTOR_SUPPORT_SRC}
${LIBWIRESHARK_ASM_FILES}
+ ../image/libwireshark.rc
)
add_dependencies(epan gitversion)
diff --git a/filetap/CMakeLists.txt b/filetap/CMakeLists.txt
index f78bc7df4e..455f9ddae3 100644
--- a/filetap/CMakeLists.txt
+++ b/filetap/CMakeLists.txt
@@ -53,6 +53,7 @@ set(filetap_LIBS
add_library(filetap ${LINK_MODE_LIB}
${FILETAP_FILES}
+ ../image/filetap.rc
)
set(FULL_SO_VERSION "0.0.0")
diff --git a/plugins/asn1/CMakeLists.txt b/plugins/asn1/CMakeLists.txt
index d7cebba76f..07bb50519e 100644
--- a/plugins/asn1/CMakeLists.txt
+++ b/plugins/asn1/CMakeLists.txt
@@ -54,6 +54,7 @@ register_dissector_files(plugin.c
add_library(asn1 ${LINK_MODE_MODULE}
${PLUGIN_FILES}
+ plugin.rc
)
set_target_properties(asn1 PROPERTIES PREFIX "")
set_target_properties(asn1 PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
diff --git a/plugins/docsis/CMakeLists.txt b/plugins/docsis/CMakeLists.txt
index 7a26e5f788..8503d6cd83 100644
--- a/plugins/docsis/CMakeLists.txt
+++ b/plugins/docsis/CMakeLists.txt
@@ -92,6 +92,7 @@ register_dissector_files(plugin.c
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}")
diff --git a/plugins/ethercat/CMakeLists.txt b/plugins/ethercat/CMakeLists.txt
index 50a0687537..a77384c820 100644
--- a/plugins/ethercat/CMakeLists.txt
+++ b/plugins/ethercat/CMakeLists.txt
@@ -55,6 +55,7 @@ register_dissector_files(plugin.c
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}")
diff --git a/plugins/gryphon/CMakeLists.txt b/plugins/gryphon/CMakeLists.txt
index d80b0ccfd1..fdf9a51b4f 100644
--- a/plugins/gryphon/CMakeLists.txt
+++ b/plugins/gryphon/CMakeLists.txt
@@ -49,6 +49,7 @@ register_dissector_files(plugin.c
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}")
diff --git a/plugins/irda/CMakeLists.txt b/plugins/irda/CMakeLists.txt
index 289865db65..551e537f6f 100644
--- a/plugins/irda/CMakeLists.txt
+++ b/plugins/irda/CMakeLists.txt
@@ -51,6 +51,7 @@ register_dissector_files(plugin.c
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}")
diff --git a/plugins/m2m/CMakeLists.txt b/plugins/m2m/CMakeLists.txt
index 3020afd31c..4dda097b15 100644
--- a/plugins/m2m/CMakeLists.txt
+++ b/plugins/m2m/CMakeLists.txt
@@ -54,6 +54,7 @@ register_dissector_files(plugin.c
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}")
diff --git a/plugins/mate/CMakeLists.txt b/plugins/mate/CMakeLists.txt
index 1f6d5616eb..28c41f296a 100644
--- a/plugins/mate/CMakeLists.txt
+++ b/plugins/mate/CMakeLists.txt
@@ -70,6 +70,7 @@ register_dissector_files(plugin.c
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}")
diff --git a/plugins/opcua/CMakeLists.txt b/plugins/opcua/CMakeLists.txt
index 26b7634b1d..281e8cb0cd 100644
--- a/plugins/opcua/CMakeLists.txt
+++ b/plugins/opcua/CMakeLists.txt
@@ -64,6 +64,7 @@ register_dissector_files(plugin.c
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}")
diff --git a/plugins/profinet/CMakeLists.txt b/plugins/profinet/CMakeLists.txt
index ff691a2a85..48c2a2b7c4 100644
--- a/plugins/profinet/CMakeLists.txt
+++ b/plugins/profinet/CMakeLists.txt
@@ -61,6 +61,7 @@ register_dissector_files(plugin.c
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}")
diff --git a/plugins/stats_tree/CMakeLists.txt b/plugins/stats_tree/CMakeLists.txt
index 99975e1c85..e8dfdae13c 100644
--- a/plugins/stats_tree/CMakeLists.txt
+++ b/plugins/stats_tree/CMakeLists.txt
@@ -38,6 +38,7 @@ endif()
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}")
diff --git a/plugins/tpg/CMakeLists.txt b/plugins/tpg/CMakeLists.txt
index c641f12ab9..066f68f300 100644
--- a/plugins/tpg/CMakeLists.txt
+++ b/plugins/tpg/CMakeLists.txt
@@ -69,6 +69,7 @@ ADD_CUSTOM_COMMAND(
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})
diff --git a/plugins/unistim/CMakeLists.txt b/plugins/unistim/CMakeLists.txt
index 9e51055e02..1f8cf08715 100644
--- a/plugins/unistim/CMakeLists.txt
+++ b/plugins/unistim/CMakeLists.txt
@@ -49,6 +49,7 @@ register_dissector_files(plugin.c
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}")
diff --git a/plugins/wimax/CMakeLists.txt b/plugins/wimax/CMakeLists.txt
index 5aa0387559..32c5b07dd3 100644
--- a/plugins/wimax/CMakeLists.txt
+++ b/plugins/wimax/CMakeLists.txt
@@ -94,6 +94,7 @@ register_dissector_files(plugin.c
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}")
diff --git a/plugins/wimaxasncp/CMakeLists.txt b/plugins/wimaxasncp/CMakeLists.txt
index d21ad6824b..da0ee523dc 100644
--- a/plugins/wimaxasncp/CMakeLists.txt
+++ b/plugins/wimaxasncp/CMakeLists.txt
@@ -53,6 +53,7 @@ register_dissector_files(plugin.c
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}")
diff --git a/plugins/wimaxmacphy/CMakeLists.txt b/plugins/wimaxmacphy/CMakeLists.txt
index 6ee2007dc3..b4d50eb729 100644
--- a/plugins/wimaxmacphy/CMakeLists.txt
+++ b/plugins/wimaxmacphy/CMakeLists.txt
@@ -49,6 +49,7 @@ register_dissector_files(plugin.c
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}")
diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt
index 38010ed721..550ca4d86d 100644
--- a/wiretap/CMakeLists.txt
+++ b/wiretap/CMakeLists.txt
@@ -112,6 +112,7 @@ set(wiretap_LIBS
add_library(wiretap ${LINK_MODE_LIB}
${WIRETAP_FILES}
+ ../image/wiretap.rc
)
set(FULL_SO_VERSION "0.0.0")
diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt
index 95ffa0220e..1be0bc0201 100644
--- a/wsutil/CMakeLists.txt
+++ b/wsutil/CMakeLists.txt
@@ -117,6 +117,7 @@ endif()
add_library(wsutil ${LINK_MODE_LIB}
${WSUTIL_FILES}
+ ../image/libwsutil.rc
)
set(FULL_SO_VERSION "0.0.0")