From 0e617d020f6354e536687eb5a4423aae862d9e4a Mon Sep 17 00:00:00 2001 From: Kevin Ottens Date: Mon, 2 Nov 2020 13:28:02 +0100 Subject: [PATCH] Adjust AppImage build of QtKeychain to be found by cmake Now that things are done in a more standard way, let's adjust the AppImage build so that QtKeychain is picked up properly now that our FindQt5Keychain.cmake file is gone. Signed-off-by: Kevin Ottens --- admin/linux/build-appimage.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/admin/linux/build-appimage.sh b/admin/linux/build-appimage.sh index 27ea2e7ec..e2f6e69f6 100755 --- a/admin/linux/build-appimage.sh +++ b/admin/linux/build-appimage.sh @@ -30,7 +30,7 @@ mkdir build cd build cmake -D CMAKE_INSTALL_PREFIX=/usr ../ make -j4 -make DESTDIR=/app install +make install #Build client cd /build @@ -39,8 +39,6 @@ cd build-client cmake -D CMAKE_INSTALL_PREFIX=/usr \ -D NO_SHIBBOLETH=1 \ -D BUILD_UPDATER=ON \ - -D QTKEYCHAIN_LIBRARY=/app/usr/lib/x86_64-linux-gnu/libqt5keychain.so \ - -D QTKEYCHAIN_INCLUDE_DIR=/app/usr/include/qt5keychain/ \ -DMIRALL_VERSION_SUFFIX=PR-$DRONE_PULL_REQUEST \ -DMIRALL_VERSION_BUILD=$DRONE_BUILD_NUMBER \ $DRONE_WORKSPACE -- 2.30.2