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

CMake: Add conditional builds. 

In my version of XCode ranlib complains bitterly and returns an error if
a module has no symbols. Make the AirPcap, RTP player, and remote
capture code conditional. We could also try passing
"-no_warning_for_no_symbols" to ranlib but we probably shouldn't try to
comple the code in the first place.

Change-Id: Ide4f3d649eac354d54f0dde27dbc8e9cb270c65f
Reviewed-on: https://code.wireshark.org/review/4220
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
This commit is contained in:
Gerald Combs 2014-09-20 14:49:25 -07:00 committed by Evan Huus
parent 5e231d1d9c
commit 1952d95407
2 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ui/gtk/CMakeLists.txt
View File

@ -24,8 +24,6 @@ ADD_CUSTOM_CMAKE_INCLUDE()
set(WIRESHARK_GTK_SRC
about_dlg.c
addr_resolution_dlg.c
airpcap_dlg.c
airpcap_gui_utils.c
bytes_view.c
capture_dlg.c
capture_file_dlg.c
@ -70,7 +68,6 @@ set(WIRESHARK_GTK_SRC
macros_dlg.c
main.c
main_80211_toolbar.c
main_airpcap_toolbar.c
main_filter_toolbar.c
main_menubar.c
main_statusbar.c
@ -102,7 +99,6 @@ set(WIRESHARK_GTK_SRC
proto_hier_tree_model.c
proto_tree_model.c
range_utils.c
rtp_player.c
rtp_stream.c
sctp_byte_graph_dlg.c
sctp_error_dlg.c
@ -121,6 +117,22 @@ set(WIRESHARK_GTK_SRC
${WIRESHARK_CUSTOM_GTK_SRC}
)
if (HAVE_AIRPCAP)
set(WIRESHARK_GTK_SRC
${WIRESHARK_GTK_SRC}
airpcap_dlg.c
airpcap_gui_utils.c
main_airpcap_toolbar.c
)
endif()
if(HAVE_PORTAUDIO_H)
set(WIRESHARK_GTK_SRC
${WIRESHARK_GTK_SRC}
rtp_player.c
)
endif()
if(HAVE_EXTCAP)
set(WIRESHARK_GTK_SRC
${WIRESHARK_GTK_SRC}

30
ui/qt/CMakeLists.txt
View File

@ -79,8 +79,6 @@ set(WIRESHARK_QT_HEADERS
proto_tree.h
qcustomplot.h
recent_file_status.h
remote_capture_dialog.h
remote_settings_dialog.h
sctp_all_assocs_dialog.h
sctp_assoc_analyse_dialog.h
sctp_chunk_statistics_dialog.h
@ -102,6 +100,14 @@ set(WIRESHARK_QT_HEADERS
wireshark_application.h
)
if(HAVE_PCAP_REMOTE)
set(WIRESHARK_QT_HEADERS
${WIRESHARK_QT_HEADERS}
remote_capture_dialog.h
remote_settings_dialog.h
)
endif()
file(GLOB EXTA_QT_HEADERS
packet_list_record.h
qt_ui_utils.h
@ -169,8 +175,6 @@ set(WIRESHARK_QT_SRC
qt_ui_utils.cpp
recent_file_status.cpp
related_packet_delegate.cpp
remote_capture_dialog.cpp
remote_settings_dialog.cpp
sctp_all_assocs_dialog.cpp
sctp_assoc_analyse_dialog.cpp
sctp_chunk_statistics_dialog.cpp
@ -193,6 +197,14 @@ set(WIRESHARK_QT_SRC
wireshark_application.cpp
)
if(HAVE_PCAP_REMOTE)
set(WIRESHARK_QT_SRC
${WIRESHARK_QT_SRC}
remote_capture_dialog.cpp
remote_settings_dialog.cpp
)
endif()
set(WIRESHARK_QT_TAP_SRC
conversation_dialog.cpp
endpoint_dialog.cpp
@ -240,8 +252,6 @@ set(WIRESHARK_QT_UI
preferences_dialog.ui
print_dialog.ui
profile_dialog.ui
remote_capture_dialog.ui
remote_settings_dialog.ui
sctp_all_assocs_dialog.ui
sctp_assoc_analyse_dialog.ui
sctp_chunk_statistics_dialog.ui
@ -259,6 +269,14 @@ set(WIRESHARK_QT_UI
uat_dialog.ui
)
if(HAVE_PCAP_REMOTE)
set(WIRESHARK_QT_UI
${WIRESHARK_QT_UI}
remote_capture_dialog.ui
remote_settings_dialog.ui
)
endif()
set(WIRESHARK_QT_QRC
../../image/about.qrc
../../image/display_filter.qrc