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

CMake: Fixup qtui's includes. 

Add ${MINIZIP_INCLUDE_DIRS} to qtui's includes instead of every
target's. Make more includes SYSTEM PRIVATE.
This commit is contained in:
Gerald Combs 2021-07-14 17:17:17 -07:00
parent f6872b0c3e
commit 9b78a42855
2 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -1281,13 +1281,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
find_package(SETCAP)
endif()
# Include minizip include directories
if(MINIZIP_FOUND)
include_directories(SYSTEM ${MINIZIP_INCLUDE_DIRS})
else()
set(MINIZIP_LIBRARY "")
endif()
# Windows version updates
ws_find_package(WinSparkle ENABLE_WINSPARKLE HAVE_SOFTWARE_UPDATE)
@ -2854,6 +2847,7 @@ if(BUILD_dumpcap AND PCAP_FOUND)
add_executable(dumpcap ${dumpcap_FILES})
set_extra_executable_properties(dumpcap "Executables")
target_link_libraries(dumpcap ${dumpcap_LIBS})
target_include_directories(dumpcap SYSTEM PRIVATE ${ZLIB_INCLUDE_DIRS})
install(TARGETS dumpcap
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
PERMISSIONS ${DUMPCAP_SETUID}

15
ui/qt/CMakeLists.txt
View File

@ -704,19 +704,14 @@ add_library(qtui OBJECT
wireshark-tap-register.c
)
target_include_directories(qtui
SYSTEM PUBLIC
${QT_INCLUDE_DIRS}
${WINSPARKLE_INCLUDE_DIRS}
${SPEEXDSP_INCLUDE_DIRS}
)
target_include_directories(qtui
SYSTEM PRIVATE
# Can't use imported target, linking object libraries for usage requirements
# requires CMake 3.12
${PCAP_INCLUDE_DIRS}
${GCRYPT_INCLUDE_DIRS}
${MINIZIP_INCLUDE_DIRS}
${PCAP_INCLUDE_DIRS}
${QT_INCLUDE_DIRS}
${SPEEXDSP_INCLUDE_DIRS}
${WINSPARKLE_INCLUDE_DIRS}
PRIVATE
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}