napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

finished: enable Qt6 build

Browse Source
This commit is contained in:
Adriaan de Groot 2023-09-03 22:39:30 +02:00
parent c5929e30d1
commit 30a8b337e1
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/CMakeLists.txt
View File

@ -22,7 +22,7 @@ file(GLOB SUBDIRECTORIES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*")
list(SORT SUBDIRECTORIES) list(SORT SUBDIRECTORIES)
if(WITH_QT6) # TODO: Qt6 if(WITH_QT6) # TODO: Qt6
set(SUBDIRECTORIES welcome welcomeq) set(SUBDIRECTORIES finished finishedq welcome welcomeq)
endif() endif()
foreach(SUBDIRECTORY ${SUBDIRECTORIES}) foreach(SUBDIRECTORY ${SUBDIRECTORIES})

4
src/modules/finished/CMakeLists.txt
View File

@ -3,7 +3,7 @@
# SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org> # SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
# SPDX-License-Identifier: BSD-2-Clause # SPDX-License-Identifier: BSD-2-Clause
# #
find_package(Qt5 ${QT_VERSION} CONFIG REQUIRED DBus Network) find_package(${qtname} ${QT_VERSION} CONFIG REQUIRED DBus Network)
include_directories(${PROJECT_BINARY_DIR}/src/libcalamaresui) include_directories(${PROJECT_BINARY_DIR}/src/libcalamaresui)
@ -17,6 +17,6 @@ calamares_add_plugin(finished
UI UI
FinishedPage.ui FinishedPage.ui
LINK_PRIVATE_LIBRARIES LINK_PRIVATE_LIBRARIES
Qt5::DBus ${qtname}::DBus
SHARED_LIB SHARED_LIB
) )

6
src/modules/finishedq/CMakeLists.txt
View File

@ -8,8 +8,8 @@ if(NOT WITH_QML)
return() return()
endif() endif()
find_package(Qt5 ${QT_VERSION} CONFIG COMPONENTS DBus Network) find_package(${qtname} ${QT_VERSION} CONFIG COMPONENTS DBus Network)
if(NOT TARGET Qt5::DBus OR NOT TARGET Qt5::Network) if(NOT TARGET ${qtname}::DBus OR NOT TARGET ${qtname}::Network)
calamares_skip_module( "finishedq (missing DBus or Network)" ) calamares_skip_module( "finishedq (missing DBus or Network)" )
return() return()
endif() endif()
@ -26,6 +26,6 @@ calamares_add_plugin(finishedq
RESOURCES RESOURCES
finishedq.qrc finishedq.qrc
LINK_PRIVATE_LIBRARIES LINK_PRIVATE_LIBRARIES
Qt5::DBus ${qtname}::DBus
SHARED_LIB SHARED_LIB
) )