diff options
| author | 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> | 2025-09-10 22:57:12 +1000 |
|---|---|---|
| committer | 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> | 2025-09-10 22:57:12 +1000 |
| commit | f3d086024b5e6987e8592a96c90be1293acbf2f5 (patch) | |
| tree | 21fe08df63cfa11a5c05a8f3e6dd57bbdc446a80 /plugin | |
| parent | launcher: not full rounding + better anim (diff) | |
| download | caelestia-shell-f3d086024b5e6987e8592a96c90be1293acbf2f5.tar.gz caelestia-shell-f3d086024b5e6987e8592a96c90be1293acbf2f5.tar.bz2 caelestia-shell-f3d086024b5e6987e8592a96c90be1293acbf2f5.zip | |
plugin: remove multimedia dep
Also remove QML module version
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | plugin/src/Caelestia/CMakeLists.txt | 15 |
2 files changed, 12 insertions, 13 deletions
diff --git a/plugin/CMakeLists.txt b/plugin/CMakeLists.txt index 5fd58ad..062959c 100644 --- a/plugin/CMakeLists.txt +++ b/plugin/CMakeLists.txt @@ -1,11 +1 @@ -find_package(Qt6 REQUIRED COMPONENTS Core Qml Gui Concurrent Multimedia) - -if(QT_KNOWN_POLICY_QTP0001) - qt_policy(SET QTP0001 NEW) -endif() - -string(REGEX MATCH "^[0-9]+\\.[0-9]+" VERSION_SHORT "${VERSION}") - -set(QT_QML_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/qml") -qt_standard_project_setup() add_subdirectory(src/Caelestia) diff --git a/plugin/src/Caelestia/CMakeLists.txt b/plugin/src/Caelestia/CMakeLists.txt index bff65c5..1a96bf4 100644 --- a/plugin/src/Caelestia/CMakeLists.txt +++ b/plugin/src/Caelestia/CMakeLists.txt @@ -1,12 +1,15 @@ +find_package(Qt6 REQUIRED COMPONENTS Core Qml Gui Concurrent) find_package(PkgConfig REQUIRED) pkg_check_modules(Qalculate IMPORTED_TARGET libqalculate REQUIRED) pkg_check_modules(Pipewire IMPORTED_TARGET libpipewire-0.3 REQUIRED) pkg_check_modules(Aubio IMPORTED_TARGET aubio REQUIRED) pkg_check_modules(Cava IMPORTED_TARGET cava REQUIRED) +set(QT_QML_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/qml") +qt_standard_project_setup(REQUIRES 6.9) + qt_add_qml_module(caelestia URI Caelestia - VERSION ${VERSION_SHORT} SOURCES cutils.hpp cutils.cpp cachingimagemanager.hpp cachingimagemanager.cpp @@ -38,6 +41,12 @@ install(FILES "${module_qmldir}" DESTINATION "${module_dir}") install(FILES "${module_typeinfo}" DESTINATION "${module_dir}") target_link_libraries(caelestia PRIVATE - Qt::Core Qt::Qml Qt::Gui Qt::Concurrent Qt::Multimedia - PkgConfig::Qalculate PkgConfig::Pipewire PkgConfig::Aubio PkgConfig::Cava + Qt::Core + Qt::Qml + Qt::Gui + Qt::Concurrent + PkgConfig::Qalculate + PkgConfig::Pipewire + PkgConfig::Aubio + PkgConfig::Cava ) |