From 43d490080952bfe3ad07611da48ee8d8d455eac3 Mon Sep 17 00:00:00 2001 From: blue Date: Fri, 13 Dec 2024 20:27:47 +0200 Subject: [PATCH] Some more build fixes --- .gitea/workflows/release.yml | 4 ++-- README.md | 1 + cmake/Config.cmake.in | 4 ++-- packaging/Archlinux/PKGBUILD | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 8cdc744..733957a 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -12,7 +12,7 @@ jobs: package-name: lmdbal-qt5 description: LMDB Abstraction Layer, qt5 version depends: 'qt5-base' - flags: -D QT_VERSION_MAJOR=5 -D LMDBAL_NAME=LMDBAL-QT5 + flags: -D QT_VERSION_MAJOR=5 -D LMDBAL_NAME=LMDBALQT5 secrets: DEPLOY_TO_AUR_PRIVATE_KEY: ${{ secrets.DEPLOY_TO_AUR_PRIVATE_KEY }} DEPLOY_TO_AUR_USER_NAME: ${{ secrets.DEPLOY_TO_AUR_USER_NAME }} @@ -25,7 +25,7 @@ jobs: package-name: lmdbal-qt6 description: LMDB Abstraction Layer, qt6 version depends: 'qt6-base' - flags: -D QT_VERSION_MAJOR=6 -D LMDBAL_NAME=LMDBAL-QT6 + flags: -D QT_VERSION_MAJOR=6 -D LMDBAL_NAME=LMDBALQT6 secrets: DEPLOY_TO_AUR_PRIVATE_KEY: ${{ secrets.DEPLOY_TO_AUR_PRIVATE_KEY }} DEPLOY_TO_AUR_USER_NAME: ${{ secrets.DEPLOY_TO_AUR_USER_NAME }} diff --git a/README.md b/README.md index 36b620e..9c6a152 100644 --- a/README.md +++ b/README.md @@ -84,6 +84,7 @@ Here is the list of keys you can pass to configuration phase of `cmake ..`: - `BUILD_DOC` - `True` build doxygen documentation, `False` does not (default is `False`); - `BUILD_DOXYGEN_AWESOME` - `True` build doxygen awesome theme if `BUILD_DOC` is also `True` (default is `False`); - `QT_VERSION_MAJOR` - `5` links against Qt5, `6` links agains Qt6, there is no default, so, if you didn't specify it the project will chose automatically; +- `LMDBAL_NAME` - `LMDBAL` builds main target with this name, also install path witll be this name lowercase, usefull if you want to build `LMDBAL-QT6` not to conflict with `LMDBAL-QT5`; #### Running tests diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in index 8fea032..f470d3d 100644 --- a/cmake/Config.cmake.in +++ b/cmake/Config.cmake.in @@ -1,5 +1,5 @@ @PACKAGE_INIT@ -include("${CMAKE_CURRENT_LIST_DIR}/lmdbalTargets.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/@LMDBAL_NAME_LOW@Targets.cmake") -check_required_components(lmdbal) +check_required_components(@LMDBAL_NAME_LOW@) diff --git a/packaging/Archlinux/PKGBUILD b/packaging/Archlinux/PKGBUILD index 6c80d5a..38b3e55 100644 --- a/packaging/Archlinux/PKGBUILD +++ b/packaging/Archlinux/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Yury Gubich pkgname=lmdbal pkgver=1.0.0 -pkgrel=3 +pkgrel=4 pkgdesc="LMDB Abstraction Layer" arch=('i686' 'x86_64') url="https://git.macaw.me/blue/lmdbal"