Skip to content

Commit c020f82

Browse files
authored
BUG: Fixes Linux + Qt 6.9 cmake configuration and linker errors (#752)
Signed-off-by: Michael Jackson <[email protected]>
1 parent c1555c3 commit c020f82

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

src/CMakeLists.txt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,16 @@ if (${QT_VERSION_MAJOR})
77
else()
88
find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
99
endif()
10-
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Gui Widgets REQUIRED)
11-
if (UNIX AND NOT APPLE)
10+
11+
set(ads_DEP_LIBS Core Gui Widgets)
12+
if (UNIX AND NOT APPLE AND QT_VERSION_MAJOR STREQUAL "6" AND QT_VERSION_MINOR GREATER 8)
13+
set(ads_DEP_LIBS Core Gui GuiPrivate Widgets)
14+
endif()
15+
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS ${ads_DEP_LIBS} REQUIRED)
16+
if (UNIX AND NOT APPLE AND QT_VERSION_MAJOR STREQUAL "6" AND QT_VERSION_MINOR GREATER 8)
1217
include_directories(${Qt${QT_VERSION_MAJOR}Gui_PRIVATE_INCLUDE_DIRS})
1318
endif()
19+
1420
set(CMAKE_INCLUDE_CURRENT_DIR ON)
1521
if(BUILD_STATIC)
1622
set(CMAKE_STATIC_LIBRARY_SUFFIX "_static${CMAKE_STATIC_LIBRARY_SUFFIX}")

0 commit comments

Comments
 (0)