Commit a82473dc authored by Nicolas Fella's avatar Nicolas Fella Committed by Albert Astals Cid
Browse files

Adapt build system to Qt6

parent 02850dea
Pipeline #168056 passed with stage
in 2 minutes and 7 seconds
......@@ -19,12 +19,6 @@ find_package (ECM ${KF5_REQUIRED_VERSION} REQUIRED NO_MODULE)
# where to look first for cmake modules
set (CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
find_package (Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core Widgets)
find_package (KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS
XmlGui WidgetsAddons CoreAddons ConfigWidgets I18n ItemViews IconThemes Crash DocTools
)
include(KDEInstallDirs)
include(KDECompilerSettings NO_POLICY_SCOPE)
include(KDECMakeSettings)
......@@ -33,6 +27,12 @@ include(ECMAddAppIcon)
include(ECMInstallIcons)
include(ECMSetupVersion)
find_package (Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED Core Widgets)
find_package (KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS
XmlGui WidgetsAddons CoreAddons ConfigWidgets I18n ItemViews IconThemes Crash DocTools
)
add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
add_definitions(-DQT_DEPRECATED_WARNINGS_SINCE=0x050F02)
......
......@@ -51,7 +51,7 @@ install(TARGETS kgeography EXPORT KGeography ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
install( PROGRAMS org.kde.kgeography.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
install( FILES org.kde.kgeography.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
install( FILES kgeography.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR} )
install( FILES kgeographyui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kgeography )
install( FILES kgeographyui.rc DESTINATION ${KDE_INSTALL_KXMLGUIDIR}/kgeography )
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment