cmake stuff:

- Fix fallout from gtk/text_import_scanner.l patch: Wireshark will
  build with cmake again.
- Update README.cmake a bit
- Running "cmake -DUI_MANAGER=ON" will give you the new ui-manager.



git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34885 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 11 insertions, 1 deletions

diff --git a/gtk/CMakeLists.txt b/gtk/CMakeLists.txt
index c47098944b..3f749e0047 100644
--- a/gtk/CMakeLists.txt
+++ b/gtk/CMakeLists.txt
@@ -71,7 +71,6 @@ set(WIRESHARK_GTK_SRC
 	main.c
 	main_airpcap_toolbar.c
 	main_filter_toolbar.c
-	menus.c
 	main_packet_list.c
 	main_proto_draw.c
 	main_statusbar.c
@@ -79,6 +78,7 @@ set(WIRESHARK_GTK_SRC
 	main_welcome.c
 	manual_addr_resolv.c
 	mcast_stream.c
+	menus.c
 	new_packet_list.c
 	packet_history.c
 	packet_list_store.c
@@ -218,6 +218,16 @@ if (WERROR)
 	)
 endif()
 
+add_lex_files(WIRESHARK_GTK_SRC
+	text_import_scanner.l
+)
+
+if (UI_MANAGER)
+	add_definitions(
+		-DMAIN_MENU_USE_UIMANAGER=1
+	)
+endif()
+
 register_tap_files(wireshark-tap-register.c
 	${WIRESHARK_TAP_SRC}
 )