svn commit: r1921097 - in /subversion/trunk: CMakeLists.txt build/generator/gen_cmake.py

Author: rinrab
Date: Thu Oct  3 18:54:42 2024
New Revision: 1921097

URL: http://svn.apache.org/viewvc?rev=1921097&view=rev
Log:
cmake: Support compilation of auth KWallet.

For the KWallet dependency, we are going to use a CMake config, which will be
looking for the KWallet library itself, and all other dependencies of this
library.

* build/generator/gen_cmake.py
  (get_target_conditions): Add SVN_ENABLE_AUTH_KWALLET enable condition when
   mitting libsvn_auth_kwallet target and do little rework in the code.
  (check_ignore_target): Remove 'libsvn_auth_kwallet' from the
   ignore_names list.
* CMakeLists.txt
  (options): Add SVN_ENABLE_AUTH_KWALLET option.
  (kwallet dependency): Search for this dependency and create an alias
   to external-kwallet library.

Modified:
    subversion/trunk/CMakeLists.txt
    subversion/trunk/build/generator/gen_cmake.py

Modified: subversion/trunk/CMakeLists.txt
URL: http://svn.apache.org/viewvc/subversion/trunk/CMakeLists.txt?rev=1921097&r1=1921096&r2=1921097&view=diff
==============================================================================
--- subversion/trunk/CMakeLists.txt (original)
+++ subversion/trunk/CMakeLists.txt Thu Oct  3 18:54:42 2024
@@ -89,6 +89,7 @@ option(SVN_ENABLE_FS_FS "Enable Subversi
 option(SVN_ENABLE_FS_X "Enable Subversion FSX Repository Filesystem Library" ON)
 option(SVN_ENABLE_FS_BASE "Enable Subversion Filesystem Base Library (NOT IMPLEMENTED and DEPRECATED)" OFF)
 option(SVN_ENABLE_NLS "Enable gettext functionality" OFF)
+option(SVN_ENABLE_AUTH_KWALLET "Enable KWallet authentification library" OFF)
 
 option(SVN_INSTALL_PRIVATE_H "Instal private header files." OFF)
 
@@ -275,6 +276,13 @@ if(SVN_ENABLE_APACHE_MODULES)
   add_library(external-mod_dav ALIAS httpd::mod_dav)
 endif()
 
+### KWallet
+
+if(SVN_ENABLE_AUTH_KWALLET)
+  find_package(KF5Wallet CONFIG REQUIRED)
+  add_library(external-kwallet ALIAS KF5::Wallet)
+endif()
+
 if(SVN_ENABLE_SWIG_PERL OR SVN_ENABLE_SWIG_PYTHON OR SVN_ENABLE_SWIG_RUBY)
   find_package(SWIG REQUIRED)
   include(${SWIG_USE_FILE})

Modified: subversion/trunk/build/generator/gen_cmake.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_cmake.py?rev=1921097&r1=1921096&r2=1921097&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_cmake.py (original)
+++ subversion/trunk/build/generator/gen_cmake.py Thu Oct  3 18:54:42 2024
@@ -72,8 +72,11 @@ def get_target_conditions(target):
      isinstance(target, gen_base.TargetFsModule):
     enable_condition.append("SVN_ENABLE_" + get_module_name(target.name))
 
-  if isinstance(target, gen_base.TargetLib) and target.name == "libsvnxx":
-    enable_condition.append("SVN_ENABLE_SVNXX")
+  if isinstance(target, gen_base.TargetLib):
+    if target.name == "libsvnxx":
+      enable_condition.append("SVN_ENABLE_SVNXX")
+    elif target.name == "libsvn_auth_kwallet":
+      enable_condition.append("SVN_ENABLE_AUTH_KWALLET")
 
   if isinstance(target, gen_base.TargetExe):
     if target.install == "test" or target.install == "sub-test":
@@ -257,7 +260,6 @@ class Generator(gen_base.GeneratorBase):
   def check_ignore_target(self, target):
     ignore_names = [
       "libsvn_auth_gnome_keyring",
-      "libsvn_auth_kwallet",
 
       "svnxx-tests",