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

CMake: fix macOS build when both Qt5 and Qt6 are installed again 

See v3.5.0rc0-1614-g785657d9b8 for the earlier fix and context.

Fixes: v3.5.0rc0-2496-g9b78a42855 ("CMake: Fixup qtui's includes.")
This commit is contained in:
Peter Wu 2021-07-22 13:25:02 +02:00
parent 8bb7c1933d
commit 67d37da79a
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/qt/CMakeLists.txt
View File

@ -706,10 +706,14 @@ add_library(qtui OBJECT
target_include_directories(qtui
SYSTEM PRIVATE
# Include Qt before anything else, see the comment about
# QT_INCLUDE_DIRS in the top-level CMakeLists.txt
# Basically, qt@5 headers should be prioritized over qt@6 which
# would be found due to GCRYPT_INCLUDE_DIRS=/usr/local/include
${QT_INCLUDE_DIRS}
${GCRYPT_INCLUDE_DIRS}
${MINIZIP_INCLUDE_DIRS}
${PCAP_INCLUDE_DIRS}
${QT_INCLUDE_DIRS}
${SPEEXDSP_INCLUDE_DIRS}
${WINSPARKLE_INCLUDE_DIRS}
PRIVATE