marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-08-02 09:48:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adapt build system for building against qt6

Browse source
This commit is contained in:
Laurent Montel 2022-05-13 08:27:13 +02:00
parent 5f127460c7
commit 2da23eae0a
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CMakeLists.txt
View file

@ -41,15 +41,15 @@ include(FeatureSummary)
add_definitions(-DQT_NO_URL_CAST_FROM_STRING) add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED
Core Core
Qml Qml
Quick Quick
QuickCompiler
) )
if (QT_MAJOR_VERSION STREQUAL "5")
if (QUICK_COMPILER) if (QUICK_COMPILER)
find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED QuickCompiler) find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED QuickCompiler)
endif()
endif() endif()
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS

6
components/mobileshell/CMakeLists.txt
View file

@ -20,13 +20,15 @@ set(mobileshellplugin_SRCS
homescreen/favoritesmodel.cpp homescreen/favoritesmodel.cpp
taskswitcher/displaysmodel.cpp taskswitcher/displaysmodel.cpp
) )
if (QT_MAJOR_VERSION STREQUAL "5")
if(QUICK_COMPILER) if(QUICK_COMPILER)
qtquick_compiler_add_resources(RESOURCES resources.qrc) qtquick_compiler_add_resources(RESOURCES resources.qrc)
else() else()
qt5_add_resources(RESOURCES resources.qrc) qt5_add_resources(RESOURCES resources.qrc)
endif() endif()
else()
qt5_add_resources(RESOURCES resources.qrc)
endif()
add_library(mobileshellplugin SHARED ${mobileshellplugin_SRCS} ${RESOURCES}) add_library(mobileshellplugin SHARED ${mobileshellplugin_SRCS} ${RESOURCES})
target_link_libraries(mobileshellplugin target_link_libraries(mobileshellplugin