Skip to content

Commit 071854e

Browse files
committed
Fix build with Qt6.10
https://bugs.gentoo.org/966288
1 parent 3027630 commit 071854e

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -609,6 +609,10 @@ ELSE()
609609
ENDIF()
610610
FIND_PACKAGE(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS
611611
Concurrent Gui Network Widgets Charts Positioning)
612+
SET(USE_BUNDLED_QTCOMPRESS 1 CACHE BOOL "Use bundled version of qtcompress")
613+
IF(Qt6_VERSION VERSION_GREATER_EQUAL 6.10 AND NOT USE_BUNDLED_QTCOMPRESS)
614+
FIND_PACKAGE(Qt6 REQUIRED COMPONENTS GuiPrivate)
615+
ENDIF()
612616
IF(USE_PLUGIN_TELESCOPECONTROL OR ENABLE_GPS)
613617
FIND_PACKAGE(Qt${QT_VERSION_MAJOR} COMPONENTS SerialPort REQUIRED)
614618
ENDIF()
@@ -809,7 +813,6 @@ ELSE()
809813
MESSAGE(STATUS "Using system-provided zlib at ${ZLIB_LIBRARIES}")
810814
ENDIF()
811815

812-
SET(USE_BUNDLED_QTCOMPRESS 1 CACHE BOOL "Use bundled version of qtcompress")
813816
IF(USE_BUNDLED_QTCOMPRESS)
814817
ADD_DEFINITIONS(-DUSE_BUNDLED_QTCOMPRESS)
815818
MESSAGE(STATUS "Using bundled qtcompress at ${CMAKE_SOURCE_DIR}/src/external/qtcompress")

0 commit comments

Comments
 (0)