diff options
-rw-r--r-- | CMakeLists.txt | 18 | ||||
-rw-r--r-- | asn1/CMakeLists.txt | 2 | ||||
-rw-r--r-- | codecs/CMakeLists.txt | 1 | ||||
-rw-r--r-- | epan/CMakeLists.txt | 10 | ||||
-rw-r--r-- | epan/wslua/CMakeLists.txt | 1 | ||||
-rw-r--r-- | plugins/asn1/CMakeLists.txt | 1 | ||||
-rw-r--r-- | plugins/docsis/CMakeLists.txt | 1 | ||||
-rw-r--r-- | plugins/ethercat/CMakeLists.txt | 1 | ||||
-rw-r--r-- | plugins/gryphon/CMakeLists.txt | 1 | ||||
-rw-r--r-- | plugins/irda/CMakeLists.txt | 1 | ||||
-rw-r--r-- | plugins/m2m/CMakeLists.txt | 1 | ||||
-rw-r--r-- | plugins/mate/CMakeLists.txt | 1 | ||||
-rw-r--r-- | plugins/opcua/CMakeLists.txt | 1 | ||||
-rw-r--r-- | plugins/profinet/CMakeLists.txt | 1 | ||||
-rw-r--r-- | plugins/stats_tree/CMakeLists.txt | 1 | ||||
-rw-r--r-- | plugins/tpg/CMakeLists.txt | 1 | ||||
-rw-r--r-- | plugins/unistim/CMakeLists.txt | 1 | ||||
-rw-r--r-- | plugins/wimax/CMakeLists.txt | 1 | ||||
-rw-r--r-- | plugins/wimaxasncp/CMakeLists.txt | 1 | ||||
-rw-r--r-- | plugins/wimaxmacphy/CMakeLists.txt | 1 | ||||
-rw-r--r-- | tools/lemon/CMakeLists.txt | 1 | ||||
-rw-r--r-- | ui/CMakeLists.txt | 1 | ||||
-rw-r--r-- | ui/gtk/CMakeLists.txt | 2 | ||||
-rw-r--r-- | ui/qt/CMakeLists.txt | 1 | ||||
-rw-r--r-- | wiretap/CMakeLists.txt | 1 | ||||
-rw-r--r-- | wsutil/CMakeLists.txt | 4 |
26 files changed, 56 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5d71d3db59..b4aa40805e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -562,6 +562,8 @@ test_big_endian(WORDS_BIGENDIAN) set(DATAFILE_DIR "${CMAKE_INSTALL_PREFIX}/share/${CPACK_PACKAGE_NAME}") +SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON) + if(ENABLE_PLUGINS) set(HAVE_PLUGINS 1) set(PLUGIN_DIR="${DATAFILE_DIR}/plugins/${CPACK_PACKAGE_VERSION}") @@ -691,6 +693,7 @@ ADD_CUSTOM_TARGET( DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/make-version.pl ) +set_target_properties(svnversion PROPERTIES FOLDER "Auxiliary") ADD_CUSTOM_COMMAND( OUTPUT svnversion.h @@ -885,6 +888,7 @@ if(BUILD_wireshark AND GTK_FOUND) add_executable(wireshark ${wireshark_FILES}) add_dependencies(wireshark svnversion) set_target_properties(wireshark PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") + set_target_properties(wireshark PROPERTIES FOLDER "Executables") target_link_libraries(wireshark ${wireshark_LIBS}) install(TARGETS wireshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) endif() @@ -907,11 +911,13 @@ if(BUILD_qtshark AND QT_FOUND) add_executable(qtshark ${wireshark_FILES}) add_dependencies(qtshark svnversion) set_target_properties(qtshark PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") + set_target_properties(qtshark PROPERTIES FOLDER "Executables") target_link_libraries(qtshark ${qtshark_LIBS}) install(TARGETS qtshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) endif() register_tap_files(tshark-tap-register.c + tshark-taps ${TSHARK_TAP_SRC} ) @@ -934,6 +940,7 @@ if(BUILD_tshark) add_executable(tshark ${tshark_FILES}) add_dependencies(tshark svnversion) set_target_properties(tshark PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") + set_target_properties(tshark PROPERTIES FOLDER "Executables") target_link_libraries(tshark ${tshark_LIBS}) install(TARGETS tshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) endif() @@ -952,6 +959,7 @@ if(BUILD_rawshark AND PCAP_FOUND) add_executable(rawshark ${rawshark_FILES}) add_dependencies(rawshark svnversion) set_target_properties(rawshark PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") + set_target_properties(rawshark PROPERTIES FOLDER "Executables") target_link_libraries(rawshark ${rawshark_LIBS}) install(TARGETS rawshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) endif() @@ -966,6 +974,7 @@ if(BUILD_dftest) ) add_executable(dftest ${dftest_FILES}) set_target_properties(dftest PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") + set_target_properties(dftest PROPERTIES FOLDER "Executables") target_link_libraries(dftest ${dftest_LIBS}) install(TARGETS dftest RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) endif() @@ -973,6 +982,7 @@ endif() if(BUILD_randpkt) set(randpkt_LIBS wiretap + wsutil ${M_LIBRARIES} ${PCAP_LIBRARIES} # @SOCKET_LIBS@ @@ -986,6 +996,7 @@ if(BUILD_randpkt) ) add_executable(randpkt ${randpkt_FILES}) set_target_properties(randpkt PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") + set_target_properties(randpkt PROPERTIES FOLDER "Executables") target_link_libraries(randpkt ${randpkt_LIBS}) install(TARGETS randpkt RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) endif() @@ -1009,6 +1020,7 @@ if(BUILD_text2pcap) add_executable(text2pcap ${text2pcap_FILES}) add_dependencies(text2pcap svnversion) set_target_properties(text2pcap PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") + set_target_properties(text2pcap PROPERTIES FOLDER "Executables") target_link_libraries(text2pcap ${text2pcap_LIBS}) install(TARGETS text2pcap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) endif() @@ -1027,6 +1039,7 @@ if(BUILD_mergecap) add_executable(mergecap ${mergecap_FILES}) add_dependencies(mergecap svnversion) set_target_properties(mergecap PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") + set_target_properties(mergecap PROPERTIES FOLDER "Executables") target_link_libraries(mergecap ${mergecap_LIBS}) install(TARGETS mergecap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) endif() @@ -1045,6 +1058,7 @@ if(BUILD_reordercap) add_executable(reordercap ${reordercap_FILES}) add_dependencies(reordercap svnversion) set_target_properties(reordercap PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") + set_target_properties(reordercap PROPERTIES FOLDER "Executables") target_link_libraries(reordercap ${reordercap_LIBS}) install(TARGETS reordercap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) endif() @@ -1064,6 +1078,7 @@ if(BUILD_capinfos) add_executable(capinfos ${capinfos_FILES}) add_dependencies(capinfos svnversion) set_target_properties(capinfos PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") + set_target_properties(capinfos PROPERTIES FOLDER "Executables") target_link_libraries(capinfos ${capinfos_LIBS}) install(TARGETS capinfos RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) endif() @@ -1081,6 +1096,7 @@ if(BUILD_editcap) add_executable(editcap ${editcap_FILES}) add_dependencies(editcap svnversion) set_target_properties(editcap PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") + set_target_properties(editcap PROPERTIES FOLDER "Executables") target_link_libraries(editcap ${editcap_LIBS}) install(TARGETS editcap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) endif() @@ -1118,6 +1134,7 @@ if(BUILD_dumpcap AND PCAP_FOUND) add_executable(dumpcap ${dumpcap_FILES}) add_dependencies(dumpcap svnversion) set_target_properties(dumpcap PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") + set_target_properties(dumpcap PROPERTIES FOLDER "Executables") target_link_libraries(dumpcap ${dumpcap_LIBS}) install(TARGETS dumpcap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) endif() @@ -1190,6 +1207,7 @@ add_custom_target( wireshark.html wireshark-filter.html ) +set_target_properties(auxiliary PROPERTIES FOLDER "Docs") set(MAN1_FILES ${CMAKE_BINARY_DIR}/capinfos.1 diff --git a/asn1/CMakeLists.txt b/asn1/CMakeLists.txt index f614ac56c7..a30eb14b24 100644 --- a/asn1/CMakeLists.txt +++ b/asn1/CMakeLists.txt @@ -126,7 +126,7 @@ set(ASN1_SRC_DIRS ) set( BROKEN_ASN1_SRC_DIRS - # Kerberos is a handwritten dissecotr, don't replace + # Kerberos is a handwritten dissector, don't replace kerberos # x721 does not build x721 diff --git a/codecs/CMakeLists.txt b/codecs/CMakeLists.txt index 35090798f5..8c7c39e877 100644 --- a/codecs/CMakeLists.txt +++ b/codecs/CMakeLists.txt @@ -30,3 +30,4 @@ add_library(codecs STATIC ${CODECS_FILES} ) set_target_properties(codecs PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") +set_target_properties(codecs PROPERTIES FOLDER "codecs") diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index 25fd2ff0aa..6d1c2a5974 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -24,9 +24,12 @@ if (HAVE_LIBLUA) include( wslua/CMakeLists.txt ) endif() +source_group(wslua FILES ${WSLUA_FILES}) + if (HAVE_LIBPYTHON) include( wspython/CMakeLists.txt ) endif() +source_group(wspython FILES ${WSPYTHON_FILES}) add_subdirectory( dissectors/dcerpc ) @@ -46,6 +49,7 @@ set(CRYPT_FILES crypt/airpdcap_rijndael.c crypt/airpdcap_tkip.c ) +source_group(crypt FILES ${CRYPT_FILES}) set(DFILTER_FILES dfilter/dfilter.c @@ -63,6 +67,7 @@ set(DFILTER_FILES dfilter/sttype-test.c dfilter/syntax-tree.c ) +source_group(dfilter FILES ${DFILTER_FILES}) set(DFILTER_CLEAN_FILES ${DFILTER_FILES} @@ -1338,6 +1343,7 @@ set(DISSECTOR_SUPPORT_SRC dissectors/usb.c register.c ) +source_group(dissector-support FILES ${DISSECTOR_SUPPORT_SRC}) set(LIBWIRESHARK_ASM_FILES asm_utils.c @@ -1363,6 +1369,7 @@ set(DISSECTOR_FILES ${ASN1_DISSECTOR_SRC} ${DIRTY_ASN1_DISSECTOR_SRC} ) +source_group(dissectors FILES ${DISSECTOR_FILES}) register_dissector_files(register.c dissectors @@ -1383,6 +1390,7 @@ set(FTYPE_FILES ftypes/ftype-time.c ftypes/ftype-tvbuff.c ) +source_group(ftype FILES ${FTYPE_FILES}) set(WMEM_FILES wmem/wmem_array.c @@ -1399,6 +1407,7 @@ set(WMEM_FILES wmem/wmem_tree.c wmem/wmem_user_cb.c ) +source_group(wmem FILES ${WMEM_FILES}) ADD_CUSTOM_COMMAND( OUTPUT @@ -1652,6 +1661,7 @@ add_custom_target(dumpabi-libwireshark DEPENDS libwireshark.abi.tar.gz) # By default the name for a library with target name epan will be libepan, # but Ethereal is now named Wireshark SET_TARGET_PROPERTIES(epan PROPERTIES OUTPUT_NAME "wireshark") +set_target_properties(epan PROPERTIES FOLDER "DLLs") target_link_libraries(epan ${epan_LIBS}) diff --git a/epan/wslua/CMakeLists.txt b/epan/wslua/CMakeLists.txt index 0f323db547..a244687103 100644 --- a/epan/wslua/CMakeLists.txt +++ b/epan/wslua/CMakeLists.txt @@ -108,6 +108,7 @@ add_custom_target( DEPENDS init.lua ) +set_target_properties(wsluaauxiliary PROPERTIES FOLDER "Auxiliary") install( FILES diff --git a/plugins/asn1/CMakeLists.txt b/plugins/asn1/CMakeLists.txt index b8f171ed73..6485d263cc 100644 --- a/plugins/asn1/CMakeLists.txt +++ b/plugins/asn1/CMakeLists.txt @@ -59,6 +59,7 @@ add_library(asn1 ${LINK_MODE_MODULE} ) set_target_properties(asn1 PROPERTIES PREFIX "") set_target_properties(asn1 PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") +set_target_properties(asn1 PROPERTIES FOLDER "Plugins") target_link_libraries(asn1 epan) diff --git a/plugins/docsis/CMakeLists.txt b/plugins/docsis/CMakeLists.txt index 1b6c9d65d6..6eca55980c 100644 --- a/plugins/docsis/CMakeLists.txt +++ b/plugins/docsis/CMakeLists.txt @@ -97,6 +97,7 @@ add_library(docsis ${LINK_MODE_MODULE} ) set_target_properties(docsis PROPERTIES PREFIX "") set_target_properties(docsis PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") +set_target_properties(docsis PROPERTIES FOLDER "Plugins") target_link_libraries(docsis epan) diff --git a/plugins/ethercat/CMakeLists.txt b/plugins/ethercat/CMakeLists.txt index e69b723aed..9f32bf01aa 100644 --- a/plugins/ethercat/CMakeLists.txt +++ b/plugins/ethercat/CMakeLists.txt @@ -60,6 +60,7 @@ add_library(ethercat ${LINK_MODE_MODULE} ) set_target_properties(ethercat PROPERTIES PREFIX "") set_target_properties(ethercat PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") +set_target_properties(ethercat PROPERTIES FOLDER "Plugins") target_link_libraries(ethercat epan) diff --git a/plugins/gryphon/CMakeLists.txt b/plugins/gryphon/CMakeLists.txt index 7d5b8bc476..67652a6d2e 100644 --- a/plugins/gryphon/CMakeLists.txt +++ b/plugins/gryphon/CMakeLists.txt @@ -54,6 +54,7 @@ add_library(gryphon ${LINK_MODE_MODULE} ) set_target_properties(gryphon PROPERTIES PREFIX "") set_target_properties(gryphon PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") +set_target_properties(gryphon PROPERTIES FOLDER "Plugins") target_link_libraries(gryphon epan) diff --git a/plugins/irda/CMakeLists.txt b/plugins/irda/CMakeLists.txt index 6ea71d360b..a15639f632 100644 --- a/plugins/irda/CMakeLists.txt +++ b/plugins/irda/CMakeLists.txt @@ -56,6 +56,7 @@ add_library(irda ${LINK_MODE_MODULE} ) set_target_properties(irda PROPERTIES PREFIX "") set_target_properties(irda PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") +set_target_properties(irda PROPERTIES FOLDER "Plugins") target_link_libraries(irda epan) diff --git a/plugins/m2m/CMakeLists.txt b/plugins/m2m/CMakeLists.txt index 68a250c1b4..e0d6cc97ed 100644 --- a/plugins/m2m/CMakeLists.txt +++ b/plugins/m2m/CMakeLists.txt @@ -59,6 +59,7 @@ add_library(m2m ${LINK_MODE_MODULE} ) set_target_properties(m2m PROPERTIES PREFIX "") set_target_properties(m2m PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") +set_target_properties(m2m PROPERTIES FOLDER "Plugins") target_link_libraries(m2m epan) diff --git a/plugins/mate/CMakeLists.txt b/plugins/mate/CMakeLists.txt index ebf8707e58..5220bf3f36 100644 --- a/plugins/mate/CMakeLists.txt +++ b/plugins/mate/CMakeLists.txt @@ -75,6 +75,7 @@ add_library(mate ${LINK_MODE_MODULE} ) set_target_properties(mate PROPERTIES PREFIX "") set_target_properties(mate PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") +set_target_properties(mate PROPERTIES FOLDER "Plugins") target_link_libraries(mate epan) diff --git a/plugins/opcua/CMakeLists.txt b/plugins/opcua/CMakeLists.txt index 16e4e4978e..cdbd070eb5 100644 --- a/plugins/opcua/CMakeLists.txt +++ b/plugins/opcua/CMakeLists.txt @@ -68,6 +68,7 @@ add_library(opcua ${LINK_MODE_MODULE} ) set_target_properties(opcua PROPERTIES PREFIX "") set_target_properties(opcua PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") +set_target_properties(opcua PROPERTIES FOLDER "Plugins") target_link_libraries(opcua epan) diff --git a/plugins/profinet/CMakeLists.txt b/plugins/profinet/CMakeLists.txt index 01850c06a2..5fd80da5e7 100644 --- a/plugins/profinet/CMakeLists.txt +++ b/plugins/profinet/CMakeLists.txt @@ -66,6 +66,7 @@ add_library(profinet ${LINK_MODE_MODULE} ) set_target_properties(profinet PROPERTIES PREFIX "") set_target_properties(profinet PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") +set_target_properties(profinet PROPERTIES FOLDER "Plugins") target_link_libraries(profinet epan) diff --git a/plugins/stats_tree/CMakeLists.txt b/plugins/stats_tree/CMakeLists.txt index e2c2a5324a..59f85a3a10 100644 --- a/plugins/stats_tree/CMakeLists.txt +++ b/plugins/stats_tree/CMakeLists.txt @@ -43,6 +43,7 @@ add_library(stats_tree ${LINK_MODE_MODULE} ) 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") target_link_libraries(stats_tree epan) diff --git a/plugins/tpg/CMakeLists.txt b/plugins/tpg/CMakeLists.txt index 7be20d76f8..4cfa444655 100644 --- a/plugins/tpg/CMakeLists.txt +++ b/plugins/tpg/CMakeLists.txt @@ -74,6 +74,7 @@ add_library(tpg ${LINK_MODE_MODULE} ) set_target_properties(tpg PROPERTIES PREFIX "") set_target_properties(tpg PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS}) +set_target_properties(tpg PROPERTIES FOLDER "Plugins") target_link_libraries(tpg epan) diff --git a/plugins/unistim/CMakeLists.txt b/plugins/unistim/CMakeLists.txt index 09df44385e..1cf943c64d 100644 --- a/plugins/unistim/CMakeLists.txt +++ b/plugins/unistim/CMakeLists.txt @@ -54,6 +54,7 @@ add_library(unistim ${LINK_MODE_MODULE} ) set_target_properties(unistim PROPERTIES PREFIX "") set_target_properties(unistim PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") +set_target_properties(unistim PROPERTIES FOLDER "Plugins") target_link_libraries(unistim epan) diff --git a/plugins/wimax/CMakeLists.txt b/plugins/wimax/CMakeLists.txt index 7011f613cc..cc963b439c 100644 --- a/plugins/wimax/CMakeLists.txt +++ b/plugins/wimax/CMakeLists.txt @@ -99,6 +99,7 @@ add_library(wimax ${LINK_MODE_MODULE} ) set_target_properties(wimax PROPERTIES PREFIX "") set_target_properties(wimax PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") +set_target_properties(wimax PROPERTIES FOLDER "Plugins") target_link_libraries(wimax epan) diff --git a/plugins/wimaxasncp/CMakeLists.txt b/plugins/wimaxasncp/CMakeLists.txt index e3e10be9d0..b39515afa9 100644 --- a/plugins/wimaxasncp/CMakeLists.txt +++ b/plugins/wimaxasncp/CMakeLists.txt @@ -58,6 +58,7 @@ add_library(wimaxasncp ${LINK_MODE_MODULE} ) set_target_properties(wimaxasncp PROPERTIES PREFIX "") set_target_properties(wimaxasncp PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") +set_target_properties(wimaxasncp PROPERTIES FOLDER "Plugins") target_link_libraries(wimaxasncp epan) diff --git a/plugins/wimaxmacphy/CMakeLists.txt b/plugins/wimaxmacphy/CMakeLists.txt index ecdabfecd6..44e25d0ca9 100644 --- a/plugins/wimaxmacphy/CMakeLists.txt +++ b/plugins/wimaxmacphy/CMakeLists.txt @@ -54,6 +54,7 @@ add_library(wimaxmacphy ${LINK_MODE_MODULE} ) set_target_properties(wimaxmacphy PROPERTIES PREFIX "") set_target_properties(wimaxmacphy PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") +set_target_properties(wimaxmacphy PROPERTIES FOLDER "Plugins") target_link_libraries(wimaxmacphy epan) diff --git a/tools/lemon/CMakeLists.txt b/tools/lemon/CMakeLists.txt index a6c53372c2..0c806186e5 100644 --- a/tools/lemon/CMakeLists.txt +++ b/tools/lemon/CMakeLists.txt @@ -42,5 +42,6 @@ set(lemon_LIBS ) add_executable(lemon ${lemon_FILES}) +set_target_properties(lemon PROPERTIES FOLDER "tools") target_link_libraries(lemon ${lemon_LIBS}) diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt index ff15e2eb99..73375a3654 100644 --- a/ui/CMakeLists.txt +++ b/ui/CMakeLists.txt @@ -70,3 +70,4 @@ add_library(ui STATIC ) set_target_properties(ui PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") +set_target_properties(ui PROPERTIES FOLDER "UI") diff --git a/ui/gtk/CMakeLists.txt b/ui/gtk/CMakeLists.txt index 84332c526e..9fd0e1a817 100644 --- a/ui/gtk/CMakeLists.txt +++ b/ui/gtk/CMakeLists.txt @@ -253,6 +253,7 @@ if(WIN32) endif() register_tap_files(wireshark-tap-register.c + taps ${WIRESHARK_TAP_SRC} ) @@ -263,6 +264,7 @@ add_library(gtkui STATIC wireshark-tap-register.c ) set_target_properties(gtkui PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") +set_target_properties(gtkui PROPERTIES FOLDER "UI") install( DIRECTORY diff --git a/ui/qt/CMakeLists.txt b/ui/qt/CMakeLists.txt index 5dc8e3f1ed..3e45c5e713 100644 --- a/ui/qt/CMakeLists.txt +++ b/ui/qt/CMakeLists.txt @@ -249,4 +249,5 @@ add_library(qtui STATIC ${QTSHARK_TS_QM} ) set_target_properties(qtui PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") +set_target_properties(qtui PROPERTIES FOLDER "UI") diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt index c4d0295eea..7fc2275da5 100644 --- a/wiretap/CMakeLists.txt +++ b/wiretap/CMakeLists.txt @@ -119,6 +119,7 @@ set(FULL_SO_VERSION "0.0.0") set_target_properties(wiretap PROPERTIES COMPILE_DEFINITIONS "WS_BUILD_DLL") set_target_properties(wiretap PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") set_target_properties(wiretap PROPERTIES VERSION ${FULL_SO_VERSION} SOVERSION 0) +set_target_properties(wiretap PROPERTIES FOLDER "DLLs") # discover and substitute list of include directories for ABI compatibility # checks diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt index f863f7942b..cbc5d0de03 100644 --- a/wsutil/CMakeLists.txt +++ b/wsutil/CMakeLists.txt @@ -72,6 +72,9 @@ set(wsutil_LIBS ${GCRYPT_LIBRARIES} ${WIN_WSOCK32_LIBRARY} ) +IF(WIN32) + set(wsutil_LIBS ${wsutil_LIBS} "ws2_32.lib") +ENDIF(WIN32) set(CLEAN_FILES ${WSUTIL_FILES} @@ -94,6 +97,7 @@ set(FULL_SO_VERSION "0.0.0") set_target_properties(wsutil PROPERTIES COMPILE_DEFINITIONS "WS_BUILD_DLL") set_target_properties(wsutil PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") set_target_properties(wsutil PROPERTIES VERSION ${FULL_SO_VERSION} SOVERSION 0) +set_target_properties(wsutil PROPERTIES FOLDER "DLLs") # discover and substitute list of include directories for ABI compatibility # checks |