svn commit: r1921111 - /subversion/trunk/CMakeLists.txt

Author: rinrab
Date: Fri Oct  4 17:10:18 2024
New Revision: 1921111

URL: http://svn.apache.org/viewvc?rev=1921111&view=rev
Log:
cmake: Follow-up to r1921097: Fix KWallet auth library dependencies.

Before, only 'KF5Wallet' was working, because a C-compile was utilized
for C++ code, and it confused the testing. In this commit, finding of
all other dependencies will be introduced and will get linked into the
libsvn_auth_kwallet  library.

* CMakeLists.txt
  (kwallet): Also search for KF5CoreAddons, KF5I18n, DBus1, and Qt5 packages
   and link libsvn_auth_kwallet against them. As addition, define SVN_HAVE_KF5
   to tell Subversion to use this version of KWallet API, which is the only
   supported.

Modified:
    subversion/trunk/CMakeLists.txt

Modified: subversion/trunk/CMakeLists.txt
URL: http://svn.apache.org/viewvc/subversion/trunk/CMakeLists.txt?rev=1921111&r1=1921110&r2=1921111&view=diff
==============================================================================
--- subversion/trunk/CMakeLists.txt (original)
+++ subversion/trunk/CMakeLists.txt Fri Oct  4 17:10:18 2024
@@ -279,8 +279,21 @@ endif()
 ### KWallet
 
 if(SVN_ENABLE_AUTH_KWALLET)
-  find_package(KF5Wallet CONFIG REQUIRED)
-  add_library(external-kwallet ALIAS KF5::Wallet)
+  find_package(KF5Wallet REQUIRED)
+  find_package(KF5CoreAddons REQUIRED)
+  find_package(KF5I18n REQUIRED)
+  find_package(DBus1 REQUIRED)
+  find_package(Qt5 COMPONENTS Core REQUIRED)
+
+  add_library(external-kwallet INTERFACE)
+  target_link_libraries(external-kwallet INTERFACE
+    KF5::Wallet
+    KF5::CoreAddons
+    KF5::I18n
+    Qt5::Core
+    dbus-1
+  )
+  target_compile_definitions(external-kwallet INTERFACE SVN_HAVE_KF5)
 endif()
 
 if(SVN_ENABLE_SWIG_PERL OR SVN_ENABLE_SWIG_PYTHON OR SVN_ENABLE_SWIG_RUBY)