Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Libraries
PulseAudio-Qt
Commits
126aa3e8
Commit
126aa3e8
authored
Mar 05, 2022
by
Laurent Montel
😁
Browse files
Fix qt6 support
parent
6e06fae5
Pipeline
#145681
passed with stage
in 1 minute and 31 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
126aa3e8
...
...
@@ -5,8 +5,8 @@ set(PROJECT_VERSION 1.3.0)
project
(
PulseAudioQt VERSION
${
PROJECT_VERSION
}
)
include
(
FeatureSummary
)
find_package
(
ECM 5.
8
0.0 NO_MODULE
)
find_package
(
ECM 5.
9
0.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
(
Qt
5
Test 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
(
Qt
5
Qml 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
(
Qt
5
Quick 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"
)
...
...
src/CMakeLists.txt
View file @
126aa3e8
...
...
@@ -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
"Qt
5
Core"
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_KF
5
}
/KF5PulseAudioQt/PulseAudioQt COMPONENT Devel
DESTINATION
${
KDE_INSTALL_INCLUDEDIR_KF
}
/KF5PulseAudioQt/PulseAudioQt COMPONENT Devel
)
if
(
BUILD_QCH
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment