Commit 126aa3e8 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Fix qt6 support

parent 6e06fae5
Pipeline #145681 passed with stage
in 1 minute and 31 seconds
......@@ -5,8 +5,8 @@ set(PROJECT_VERSION 1.3.0)
project(PulseAudioQt VERSION ${PROJECT_VERSION})
include(FeatureSummary)
find_package(ECM 5.80.0 NO_MODULE)
find_package(ECM 5.90.0 NO_MODULE)
set (KDE_COMPILERSETTINGS_LEVEL "5.82")
set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://kde.org/products/frameworks/")
feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES)
......@@ -39,13 +39,13 @@ set(REQUIRED_QT_VERSION 5.15.0)
find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core Gui DBus)
find_package(Qt${QT_MAJOR_VERSION}Test ${REQUIRED_QT_VERSION} CONFIG)
set_package_properties(Qt5Test PROPERTIES DESCRIPTION "Autotests for PulseAudioQt" TYPE OPTIONAL)
set_package_properties(Qt${QT_MAJOR_VERSION}Test PROPERTIES DESCRIPTION "Autotests for PulseAudioQt" TYPE OPTIONAL)
find_package(Qt${QT_MAJOR_VERSION}Qml ${REQUIRED_QT_VERSION} CONFIG)
set_package_properties(Qt5Qml PROPERTIES DESCRIPTION "Tests for PulseAudioQt" TYPE OPTIONAL)
set_package_properties(Qt${QT_MAJOR_VERSION}Qml PROPERTIES DESCRIPTION "Tests for PulseAudioQt" TYPE OPTIONAL)
find_package(Qt${QT_MAJOR_VERSION}Quick ${REQUIRED_QT_VERSION} CONFIG)
set_package_properties(Qt5Quick PROPERTIES DESCRIPTION "Tests for PulseAudioQt" TYPE OPTIONAL)
set_package_properties(Qt${QT_MAJOR_VERSION}Quick PROPERTIES DESCRIPTION "Tests for PulseAudioQt" TYPE OPTIONAL)
# create a Config.cmake and a ConfigVersion.cmake file and install them
set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5PulseAudioQt")
......
......@@ -78,14 +78,14 @@ ecm_generate_export_header(KF5PulseAudioQt
ecm_generate_pkgconfig_file(BASE_NAME KF5PulseAudioQt
INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KF5PulseAudioQt/
DEPS "Qt5Core"
DEPS "Qt${QT_MAJOR_VERSION}Core"
INSTALL)
install(TARGETS KF5PulseAudioQt EXPORT KF5PulseAudioQtTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
install(FILES
${PulseAudioQt_HEADERS}
${CMAKE_CURRENT_BINARY_DIR}/pulseaudioqt_export.h
DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KF5PulseAudioQt/PulseAudioQt COMPONENT Devel
DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KF5PulseAudioQt/PulseAudioQt COMPONENT Devel
)
if(BUILD_QCH)
......
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