diff options
| -rw-r--r-- | README.cmake | 4 | ||||
| -rw-r--r-- | cmake/modules/FindLEX.cmake | 1 | ||||
| -rw-r--r-- | gtk/CMakeLists.txt | 12 |
3 files changed, 14 insertions, 3 deletions
diff --git a/README.cmake b/README.cmake index 86874b3ac9..e085ce33d7 100644 --- a/README.cmake +++ b/README.cmake @@ -81,11 +81,11 @@ What needs to be done? ====================== - Add asn1 autogen target (assigned: krj) -- Redo glib2 find modules. Add version detection while at it. - Add back platform specific objects. - Fix places in the cmake files marked as todo. - Add back (working) install target. - Currently, directories are created with user umask + Currently, directories are created with user umask. + Also the guides are not installed. - Build source package (using CPack). - Build rpm package (using CPack). - Build dpkg package (using CPack). diff --git a/cmake/modules/FindLEX.cmake b/cmake/modules/FindLEX.cmake index b38411f7dd..ccb0d8dddc 100644 --- a/cmake/modules/FindLEX.cmake +++ b/cmake/modules/FindLEX.cmake @@ -43,6 +43,7 @@ MACRO(ADD_LEX_FILES _sources ) DEPENDS ${_in} ) SET(${_sources} ${${_sources}} ${_outc} ) + INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) ENDFOREACH (_current_FILE) ENDMACRO(ADD_LEX_FILES) 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} ) |