kotatogram/cmake_helpers
1
0
Fork 0
Code Issues Activity

Get rid of qt5compat dependency

Browse source
This commit is contained in:
Ilya Fedin 2023-05-11 06:10:07 +04:00 • committed by John Preston
parent dee3777ffd
commit a7d000be71
2 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
external/qt/CMakeLists.txt vendored
View file

@ -14,7 +14,6 @@ if (DESKTOP_APP_USE_PACKAGED)
INTERFACE
Qt::Core
Qt::CorePrivate
$<TARGET_NAME_IF_EXISTS:Qt::Core5Compat>
Qt::Gui
Qt::GuiPrivate
$<TARGET_NAME_IF_EXISTS:Qt::OpenGL>
@ -37,7 +36,6 @@ target_include_directories(external_qt SYSTEM
INTERFACE
${qt_loc}/include
${qt_loc}/include/QtCore
$<$<TARGET_EXISTS:Qt::Core5Compat>:${qt_loc}/include/QtCore5Compat>
${qt_loc}/include/QtGui
$<$<TARGET_EXISTS:Qt::OpenGL>:${qt_loc}/include/QtOpenGL>
${qt_loc}/include/QtWidgets
@ -62,7 +60,6 @@ INTERFACE
QT_STATICPLUGIN
QT_PLUGIN
QT_CORE_LIB
$<$<TARGET_EXISTS:Qt::Core5Compat>:QT_CORE5COMPAT_LIB>
QT_GUI_LIB
$<$<TARGET_EXISTS:Qt::OpenGL>:QT_OPENGL_LIB>
QT_WIDGETS_LIB
@ -99,12 +96,6 @@ set(common_qt_libs
lib/${qt_lib_prefix}Qt${QT_VERSION_MAJOR}Core
)
if (TARGET Qt::Core5Compat)
list(PREPEND common_qt_libs
lib/${qt_lib_prefix}Qt${QT_VERSION_MAJOR}Core5Compat
)
endif()
if (TARGET Qt::OpenGL)
list(PREPEND common_qt_libs
lib/${qt_lib_prefix}Qt${QT_VERSION_MAJOR}OpenGL

2
external/qt/package.cmake vendored
View file

@ -39,7 +39,7 @@ find_package(Qt${QT_VERSION_MAJOR} OPTIONAL_COMPONENTS Qml Quick QuickWidgets QU
set(qt_version_6_or_greater 0)
if (QT_VERSION_MAJOR GREATER_EQUAL 6)
set(qt_version_6_or_greater 1)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core5Compat OpenGL OpenGLWidgets REQUIRED)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS OpenGL OpenGLWidgets REQUIRED)
endif()
# QtWaylandScanner cmake integration from Qt 6 is used