diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2021-07-22 13:25:02 +0200 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2021-07-22 13:25:02 +0200 |
| commit | 67d37da79af4ba8ded0c8fdd98014093bebd0dff (patch) | |
| tree | 8320154b3a7e7668864741e52867e33840a81e30 /ui | |
| parent | 8bb7c1933de511572422a261be27959513f5e032 (diff) | |
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.")
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/qt/CMakeLists.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ui/qt/CMakeLists.txt b/ui/qt/CMakeLists.txt index 35c902c1d9..3dfe977443 100644 --- a/ui/qt/CMakeLists.txt +++ b/ui/qt/CMakeLists.txt @@ -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 |