forked from osmocom/wireshark
UI: Rename the qt_logwolf directory to logwolf.
We might want to split the Wireshark-specific UI code into ui/wireshark, but that can be done at another time.
This commit is contained in:
parent
ca04f4c8cb
commit
bcc286f341
|
@ -1586,7 +1586,7 @@ if(BUILD_wireshark AND QT_FOUND)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(BUILD_logwolf AND QT_FOUND)
|
if(BUILD_logwolf AND QT_FOUND)
|
||||||
add_subdirectory( ui/qt_logwolf )
|
add_subdirectory( ui/logwolf )
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Location of our plugins. PLUGIN_DIR should allow running
|
# Location of our plugins. PLUGIN_DIR should allow running
|
||||||
|
@ -2459,7 +2459,7 @@ if(BUILD_logwolf AND QT_FOUND)
|
||||||
)
|
)
|
||||||
set(logwolf_FILES
|
set(logwolf_FILES
|
||||||
$<TARGET_OBJECTS:capture_opts>
|
$<TARGET_OBJECTS:capture_opts>
|
||||||
$<TARGET_OBJECTS:ui_qt_logwolf>
|
$<TARGET_OBJECTS:ui_logwolf>
|
||||||
$<TARGET_OBJECTS:shark_common>
|
$<TARGET_OBJECTS:shark_common>
|
||||||
${LOGWOLF_SRC}
|
${LOGWOLF_SRC}
|
||||||
${PLATFORM_UI_RC_FILES}
|
${PLATFORM_UI_RC_FILES}
|
||||||
|
|
|
@ -632,7 +632,7 @@ source_group("ui\\Models Source" FILES ${LOGWOLF_MODEL_SRCS})
|
||||||
source_group("ui\\Manager Headers" FILES ${LOGWOLF_MANAGER_HEADERS})
|
source_group("ui\\Manager Headers" FILES ${LOGWOLF_MANAGER_HEADERS})
|
||||||
source_group("ui\\Manager Source" FILES ${LOGWOLF_MANAGER_SRCS})
|
source_group("ui\\Manager Source" FILES ${LOGWOLF_MANAGER_SRCS})
|
||||||
|
|
||||||
add_library(ui_qt_logwolf OBJECT
|
add_library(ui_logwolf OBJECT
|
||||||
#Included so that Visual Studio can properly put header files in solution
|
#Included so that Visual Studio can properly put header files in solution
|
||||||
${LOGWOLF_QT_HEADERS}
|
${LOGWOLF_QT_HEADERS}
|
||||||
${LOGWOLF_WIDGET_HEADERS}
|
${LOGWOLF_WIDGET_HEADERS}
|
||||||
|
@ -656,7 +656,7 @@ add_library(ui_qt_logwolf OBJECT
|
||||||
logwolf-tap-register.c
|
logwolf-tap-register.c
|
||||||
)
|
)
|
||||||
|
|
||||||
target_include_directories(ui_qt_logwolf
|
target_include_directories(ui_logwolf
|
||||||
SYSTEM PRIVATE
|
SYSTEM PRIVATE
|
||||||
# Include Qt before anything else, see the comment about
|
# Include Qt before anything else, see the comment about
|
||||||
# QT_INCLUDE_DIRS in the top-level CMakeLists.txt
|
# QT_INCLUDE_DIRS in the top-level CMakeLists.txt
|
||||||
|
@ -674,12 +674,12 @@ target_include_directories(ui_qt_logwolf
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../qt
|
${CMAKE_CURRENT_SOURCE_DIR}/../qt
|
||||||
)
|
)
|
||||||
|
|
||||||
target_compile_definitions(ui_qt_logwolf
|
target_compile_definitions(ui_logwolf
|
||||||
PUBLIC
|
PUBLIC
|
||||||
${QT_COMPILE_DEFINITIONS}
|
${QT_COMPILE_DEFINITIONS}
|
||||||
)
|
)
|
||||||
|
|
||||||
set_target_properties(ui_qt_logwolf PROPERTIES
|
set_target_properties(ui_logwolf PROPERTIES
|
||||||
LINK_FLAGS "${WS_LINK_FLAGS}"
|
LINK_FLAGS "${WS_LINK_FLAGS}"
|
||||||
FOLDER "UI"
|
FOLDER "UI"
|
||||||
AUTOMOC ON
|
AUTOMOC ON
|
||||||
|
@ -690,7 +690,7 @@ set_target_properties(ui_qt_logwolf PROPERTIES
|
||||||
)
|
)
|
||||||
|
|
||||||
if(MSVC)
|
if(MSVC)
|
||||||
set_target_properties(ui_qt_logwolf PROPERTIES LINK_FLAGS_DEBUG "${WS_MSVC_DEBUG_LINK_FLAGS}")
|
set_target_properties(ui_logwolf PROPERTIES LINK_FLAGS_DEBUG "${WS_MSVC_DEBUG_LINK_FLAGS}")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
CHECKAPI(
|
CHECKAPI(
|
|
@ -81,11 +81,11 @@
|
||||||
#include "ui/qt/utils/color_utils.h"
|
#include "ui/qt/utils/color_utils.h"
|
||||||
#include "ui/qt/coloring_rules_dialog.h"
|
#include "ui/qt/coloring_rules_dialog.h"
|
||||||
#include "ui/qt/endpoint_dialog.h"
|
#include "ui/qt/endpoint_dialog.h"
|
||||||
#include "ui/qt_logwolf/logwolf_main_window.h"
|
#include "ui/logwolf/logwolf_main_window.h"
|
||||||
#include "ui/qt/simple_dialog.h"
|
#include "ui/qt/simple_dialog.h"
|
||||||
#include "ui/qt/simple_statistics_dialog.h"
|
#include "ui/qt/simple_statistics_dialog.h"
|
||||||
#include <ui/qt/widgets/splash_overlay.h>
|
#include <ui/qt/widgets/splash_overlay.h>
|
||||||
#include "ui/qt_logwolf/logwolf_application.h"
|
#include "ui/logwolf/logwolf_application.h"
|
||||||
|
|
||||||
#include "capture/capture-pcap-util.h"
|
#include "capture/capture-pcap-util.h"
|
||||||
|
|
Loading…
Reference in New Issue