Merge pull request #2603 from nextcloud/remove_findqt5keychain_cmake_…

…module Get rid of FindQt5Keychain.cmake
nextcloud · Nov 2, 2020 · 44a5567 · 44a5567
2 parents dfd6cce + 0e617d0
commit 44a5567
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 64 deletions.
diff --git 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

diff --git a/cmake/modules/FindQt5Keychain.cmake b/cmake/modules/FindQt5Keychain.cmake
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -227,9 +227,8 @@ set( final_src
     ${3rdparty_MOC}
 )
 
-if(QTKEYCHAIN_FOUND OR QT5KEYCHAIN_FOUND)
-    list(APPEND libsync_LINK_TARGETS ${QTKEYCHAIN_LIBRARY})
-    include_directories(${QTKEYCHAIN_INCLUDE_DIR})
+if(Qt5Keychain_FOUND)
+    list(APPEND libsync_LINK_TARGETS qt5keychain)
 endif()
 
 # add executable icon on windows and osx

diff --git a/src/gui/creds/shibbolethcredentials.cpp b/src/gui/creds/shibbolethcredentials.cpp
@@ -33,7 +33,7 @@
 #include "owncloudgui.h"
 #include "syncengine.h"
 
-#include <keychain.h>
+#include <qt5keychain/keychain.h>
 
 using namespace QKeychain;
 

diff --git a/src/gui/proxyauthhandler.cpp b/src/gui/proxyauthhandler.cpp
@@ -21,7 +21,7 @@
 
 #include <QApplication>
 
-#include <keychain.h>
+#include <qt5keychain/keychain.h>
 
 using namespace OCC;
 using namespace QKeychain;

diff --git a/src/libsync/CMakeLists.txt b/src/libsync/CMakeLists.txt
@@ -106,8 +106,7 @@ target_link_libraries(${synclib_NAME}
 
 if (NOT TOKEN_AUTH_ONLY)
     find_package(Qt5 REQUIRED COMPONENTS Widgets Svg)
-    target_link_libraries(${synclib_NAME} Qt5::Widgets Qt5::Svg ${QTKEYCHAIN_LIBRARY})
-    target_include_directories(${synclib_NAME} PRIVATE ${QTKEYCHAIN_INCLUDE_DIR})
+    target_link_libraries(${synclib_NAME} Qt5::Widgets Qt5::Svg qt5keychain)
 endif()
 
 if(INOTIFY_FOUND)

diff --git a/src/libsync/account.cpp b/src/libsync/account.cpp
@@ -40,7 +40,7 @@
 #include <QJsonObject>
 #include <QJsonArray>
 
-#include <keychain.h>
+#include <qt5keychain/keychain.h>
 #include "creds/abstractcredentials.h"
 
 using namespace QKeychain;

diff --git a/src/libsync/clientsideencryption.cpp b/src/libsync/clientsideencryption.cpp
@@ -33,7 +33,7 @@
 #include <QUuid>
 #include <QScopeGuard>
 
-#include <keychain.h>
+#include <qt5keychain/keychain.h>
 #include "common/utility.h"
 
 #include "wordlist.h"

diff --git a/src/libsync/creds/httpcredentials.cpp b/src/libsync/creds/httpcredentials.cpp
@@ -22,7 +22,7 @@
 #include <QJsonDocument>
 #include <QBuffer>
 
-#include <keychain.h>
+#include <qt5keychain/keychain.h>
 
 #include "account.h"
 #include "accessmanager.h"

diff --git a/src/libsync/creds/keychainchunk.h b/src/libsync/creds/keychainchunk.h
@@ -17,7 +17,7 @@
 #define KEYCHAINCHUNK_H
 
 #include <QObject>
-#include <keychain.h>
+#include <qt5keychain/keychain.h>
 #include "accountfwd.h"
 
 // We don't support insecure fallback