Port to Qt6.
This commit is contained in:
parent
458872f359
commit
479631455c
|
@ -1,6 +1,7 @@
|
||||||
# SPDX-FileCopyrightText: Nonea
|
# SPDX-FileCopyrightText: None
|
||||||
# SPDX-License-Identifier: CC0-1.0
|
# SPDX-License-Identifier: CC0-1.0
|
||||||
|
|
||||||
include:
|
include:
|
||||||
|
- https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml
|
||||||
- https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml
|
- https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml
|
||||||
- https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml
|
- https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml
|
||||||
|
|
|
@ -34,7 +34,11 @@ include(KDECompilerSettings NO_POLICY_SCOPE)
|
||||||
include(FeatureSummary)
|
include(FeatureSummary)
|
||||||
include(GenerateExportHeader)
|
include(GenerateExportHeader)
|
||||||
|
|
||||||
find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
|
if (NOT QT_MAJOR_VERSION)
|
||||||
|
set(QT_MAJOR_VERSION "5")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
|
||||||
Core
|
Core
|
||||||
Gui
|
Gui
|
||||||
Widgets
|
Widgets
|
||||||
|
@ -57,7 +61,7 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
|
||||||
DocTools
|
DocTools
|
||||||
)
|
)
|
||||||
|
|
||||||
find_package(PolkitQt5-1 REQUIRED)
|
find_package(PolkitQt${QT_MAJOR_VERSION}-1 REQUIRED)
|
||||||
|
|
||||||
# use sane compile flags
|
# use sane compile flags
|
||||||
add_definitions(
|
add_definitions(
|
||||||
|
|
|
@ -21,13 +21,13 @@ file(GLOB partitionmanager_UIFILES config/*.ui gui/*.ui)
|
||||||
ki18n_wrap_ui(partitionmanager_SRCS ${partitionmanager_UIFILES})
|
ki18n_wrap_ui(partitionmanager_SRCS ${partitionmanager_UIFILES})
|
||||||
|
|
||||||
kconfig_add_kcfg_files(partitionmanager_SRCS config.kcfgc)
|
kconfig_add_kcfg_files(partitionmanager_SRCS config.kcfgc)
|
||||||
install(FILES partitionmanager.kcfg DESTINATION ${KCFG_INSTALL_DIR})
|
install(FILES partitionmanager.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR})
|
||||||
|
|
||||||
############################################
|
############################################
|
||||||
|
|
||||||
add_executable(partitionmanager ${partitionmanager_SRCS} )
|
add_executable(partitionmanager ${partitionmanager_SRCS} )
|
||||||
|
|
||||||
target_link_libraries(partitionmanager ${BLKID_LIBRARIES}
|
target_link_libraries(partitionmanager
|
||||||
kpmcore
|
kpmcore
|
||||||
KF5::ConfigCore
|
KF5::ConfigCore
|
||||||
KF5::ConfigGui
|
KF5::ConfigGui
|
||||||
|
@ -40,7 +40,7 @@ target_link_libraries(partitionmanager ${BLKID_LIBRARIES}
|
||||||
KF5::KIOWidgets
|
KF5::KIOWidgets
|
||||||
KF5::WidgetsAddons
|
KF5::WidgetsAddons
|
||||||
KF5::XmlGui
|
KF5::XmlGui
|
||||||
PolkitQt5-1::Core
|
PolkitQt${QT_MAJOR_VERSION}-1::Core
|
||||||
)
|
)
|
||||||
|
|
||||||
target_compile_definitions(partitionmanager PRIVATE -DCMAKE_INSTALL_FULL_LIBEXECDIR_KF5=\"${CMAKE_INSTALL_FULL_LIBEXECDIR_KF5}\")
|
target_compile_definitions(partitionmanager PRIVATE -DCMAKE_INSTALL_FULL_LIBEXECDIR_KF5=\"${CMAKE_INSTALL_FULL_LIBEXECDIR_KF5}\")
|
||||||
|
@ -48,7 +48,7 @@ target_compile_definitions(partitionmanager PRIVATE -DCMAKE_INSTALL_FULL_LIBEXEC
|
||||||
install(TARGETS partitionmanager ${INSTALL_TARGETS_DEFAULT_ARGS})
|
install(TARGETS partitionmanager ${INSTALL_TARGETS_DEFAULT_ARGS})
|
||||||
install(FILES org.kde.partitionmanager.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
|
install(FILES org.kde.partitionmanager.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
|
||||||
install(FILES gui/partitionmanagerui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/partitionmanager)
|
install(FILES gui/partitionmanagerui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/partitionmanager)
|
||||||
install(PROGRAMS org.kde.partitionmanager.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
|
install(PROGRAMS org.kde.partitionmanager.desktop DESTINATION ${KDE_INSTALL_APPDIR})
|
||||||
|
|
||||||
############################################
|
############################################
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue