Skip to content

Commit

Permalink
Add liri-cmake-shared dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
plfiorini committed Jan 17, 2024
1 parent 44b1653 commit 39cd9e7
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 5 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,4 @@ jobs:
linux-qt6:
uses: lirios/.github/.github/workflows/build-linux-qt6.yml@master
with:
dependencies: "appstream-devel appstream-qt-devel fwupd-devel ostree-devel flatpak-devel"
build_dependencies: "cmake-shared qtgsettings aurora-scanner"
build_dependencies: "cmake-shared"
15 changes: 12 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,23 @@ include(ECMQtDeclareLoggingCategory)
## Disable use of C++ API deprecated in Qt 5.15
add_compile_definitions(QT_DISABLE_DEPRECATED_UP_TO=0x050F00)

## QML import path:
if(NOT QML_IMPORT_PATH)
set(QML_IMPORT_PATH ${CMAKE_SOURCE_DIR}/bin CACHE STRING "" FORCE)
## Shared macros and functions:
if(NOT LIRI_LOCAL_ECM)
find_package(LiriCMakeShared "2.0.99" REQUIRED NO_MODULE)
list(APPEND CMAKE_MODULE_PATH "${LCS_MODULE_PATH}")
endif()

## Liri specific setup common for all modules:
include(LiriSetup)

## Features:
include(features.cmake)

## QML import path:
if(NOT QML_IMPORT_PATH)
set(QML_IMPORT_PATH ${CMAKE_SOURCE_DIR}/bin CACHE STRING "" FORCE)
endif()

## Add subdirectories:
add_subdirectory(src/interfaces)
add_subdirectory(src/interfaces/declarative)
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ And the following modules:

* [cmake](https://gitlab.kitware.com/cmake/cmake) >= 3.19.0
* [extra-cmake-modules](https://invent.kde.org/frameworks/extra-cmake-modules) >= 5.245.0
* [cmake-shared](https://github.com/lirios/cmake-shared.git) >= 2.0.99
* [wayland-protocols](https://gitlab.freedesktop.org/wayland/wayland-protocols) >= 1.25
* [xkbcommon](https://github.com/xkbcommon/libxkbcommon)

Expand Down

0 comments on commit 39cd9e7

Please sign in to comment.