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

Author: rinrab
Date: Sun Oct  6 12:08:56 2024
New Revision: 1921149

URL: http://svn.apache.org/viewvc?rev=1921149&view=rev
Log:
GitHub Actions: Add build of the libsvn_auth_kwallet and
libsvn_auth_gnome_keyring libraries to the Linux workflow.

* CMakeLists.txt
  (matrix): Configure default Linux workflow to install the required libraries
   and setup the required configure options for these auth modules.
  (Install dependecies (Linux, apt-get)): Add 'extra_packages' to the list
   of the packages to install using apt-get.
  (Configure CMake): Pass 'extra_config_opts' to CMake.

Modified:
    subversion/trunk/CMakeLists.txt

Modified: subversion/trunk/CMakeLists.txt
URL: http://svn.apache.org/viewvc/subversion/trunk/CMakeLists.txt?rev=1921149&r1=1921148&r2=1921149&view=diff
==============================================================================
--- subversion/trunk/CMakeLists.txt (original)
+++ subversion/trunk/CMakeLists.txt Sun Oct  6 12:08:56 2024
@@ -119,24 +119,26 @@ endif()
 
 set(PRIVATE_CONFIG_DEFINITIONS "")
 
-if (SVN_ENABLE_RA_LOCAL)
-  add_compile_definitions("SVN_LIBSVN_RA_LINKS_RA_LOCAL")
-endif()
-
-if (SVN_ENABLE_RA_SERF)
-  add_compile_definitions("SVN_LIBSVN_RA_LINKS_RA_SERF")
-endif()
-
-if (SVN_ENABLE_RA_SVN)
-  add_compile_definitions("SVN_LIBSVN_RA_LINKS_RA_SVN")
-endif()
-
-if (SVN_ENABLE_FS_FS)
-  add_compile_definitions("SVN_LIBSVN_FS_LINKS_FS_FS")
-endif()
-
-if (SVN_ENABLE_FS_X)
-  add_compile_definitions("SVN_LIBSVN_FS_LINKS_FS_X")
+if(NOT SVN_USE_DSO)
+  if (SVN_ENABLE_RA_LOCAL)
+    add_compile_definitions("SVN_LIBSVN_RA_LINKS_RA_LOCAL")
+  endif()
+
+  if (SVN_ENABLE_RA_SERF)
+    add_compile_definitions("SVN_LIBSVN_RA_LINKS_RA_SERF")
+  endif()
+
+  if (SVN_ENABLE_RA_SVN)
+    add_compile_definitions("SVN_LIBSVN_RA_LINKS_RA_SVN")
+  endif()
+
+  if (SVN_ENABLE_FS_FS)
+    add_compile_definitions("SVN_LIBSVN_FS_LINKS_FS_FS")
+  endif()
+
+  if (SVN_ENABLE_FS_X)
+    add_compile_definitions("SVN_LIBSVN_FS_LINKS_FS_X")
+  endif()
 endif()
 
 if(SVN_ENABLE_AUTH_KWALLET)