upgrade to qt 6 compliance
This commit is contained in:
+19
-10
@@ -94,7 +94,7 @@ find_package(OpenEXR REQUIRED)
|
||||
list(APPEND OLIVE_LIBRARIES ${OPENEXR_LIBRARIES})
|
||||
list(APPEND OLIVE_INCLUDE_DIRS ${OPENEXR_INCLUDES})
|
||||
|
||||
# Link Qt 5
|
||||
# Link Qt
|
||||
set(QT_LIBRARIES
|
||||
Core
|
||||
Gui
|
||||
@@ -102,25 +102,34 @@ set(QT_LIBRARIES
|
||||
OpenGL
|
||||
LinguistTools
|
||||
Concurrent
|
||||
OpenGLWidgets
|
||||
)
|
||||
if (UNIX AND NOT APPLE)
|
||||
list(APPEND QT_LIBRARIES DBus)
|
||||
endif()
|
||||
find_package(Qt5 5.6 REQUIRED
|
||||
find_package(QT NAMES Qt6 REQUIRED
|
||||
COMPONENTS
|
||||
${QT_LIBRARIES}
|
||||
OPTIONAL_COMPONENTS
|
||||
Network
|
||||
)
|
||||
if (NOT Qt5Network_FOUND)
|
||||
message(" Qt5::Network module not found, crash reporting will be disabled.")
|
||||
find_package(Qt${QT_VERSION_MAJOR} REQUIRED
|
||||
COMPONENTS
|
||||
${QT_LIBRARIES}
|
||||
OPTIONAL_COMPONENTS
|
||||
Network
|
||||
)
|
||||
message("Qt version: " ${QT_VERSION_MAJOR})
|
||||
if (NOT Qt${QT_VERSION_MAJOR}Network_FOUND)
|
||||
message(" Qt${QT_VERSION_MAJOR}::Network module not found, crash reporting will be disabled.")
|
||||
endif()
|
||||
list(APPEND OLIVE_LIBRARIES
|
||||
Qt5::Core
|
||||
Qt5::Gui
|
||||
Qt5::Widgets
|
||||
Qt5::OpenGL
|
||||
Qt5::Concurrent
|
||||
Qt${QT_VERSION_MAJOR}::Core
|
||||
Qt${QT_VERSION_MAJOR}::Gui
|
||||
Qt${QT_VERSION_MAJOR}::Widgets
|
||||
Qt${QT_VERSION_MAJOR}::OpenGL
|
||||
Qt${QT_VERSION_MAJOR}::Concurrent
|
||||
Qt${QT_VERSION_MAJOR}::OpenGLWidgets
|
||||
)
|
||||
|
||||
# Link FFmpeg
|
||||
@@ -186,7 +195,7 @@ if (WIN32)
|
||||
elseif (APPLE)
|
||||
list(APPEND OLIVE_LIBRARIES "-framework IOKit")
|
||||
elseif(UNIX)
|
||||
list(APPEND OLIVE_LIBRARIES Qt5::DBus)
|
||||
list(APPEND OLIVE_LIBRARIES Qt${QT_VERSION_MAJOR}::DBus)
|
||||
endif()
|
||||
|
||||
# Generate Git hash
|
||||
|
||||
Reference in New Issue
Block a user