Skip to content

Commit 74c7705

Browse files
committed
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. git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1921149 13f79535-47bb-0310-9956-ffa450edef68
1 parent 9123912 commit 74c7705

File tree

1 file changed

+16
-14
lines changed

1 file changed

+16
-14
lines changed

CMakeLists.txt

+16-14
Original file line numberDiff line numberDiff line change
@@ -119,24 +119,26 @@ endif()
119119

120120
set(PRIVATE_CONFIG_DEFINITIONS "")
121121

122-
if (SVN_ENABLE_RA_LOCAL)
123-
add_compile_definitions("SVN_LIBSVN_RA_LINKS_RA_LOCAL")
124-
endif()
122+
if(NOT SVN_USE_DSO)
123+
if (SVN_ENABLE_RA_LOCAL)
124+
add_compile_definitions("SVN_LIBSVN_RA_LINKS_RA_LOCAL")
125+
endif()
125126

126-
if (SVN_ENABLE_RA_SERF)
127-
add_compile_definitions("SVN_LIBSVN_RA_LINKS_RA_SERF")
128-
endif()
127+
if (SVN_ENABLE_RA_SERF)
128+
add_compile_definitions("SVN_LIBSVN_RA_LINKS_RA_SERF")
129+
endif()
129130

130-
if (SVN_ENABLE_RA_SVN)
131-
add_compile_definitions("SVN_LIBSVN_RA_LINKS_RA_SVN")
132-
endif()
131+
if (SVN_ENABLE_RA_SVN)
132+
add_compile_definitions("SVN_LIBSVN_RA_LINKS_RA_SVN")
133+
endif()
133134

134-
if (SVN_ENABLE_FS_FS)
135-
add_compile_definitions("SVN_LIBSVN_FS_LINKS_FS_FS")
136-
endif()
135+
if (SVN_ENABLE_FS_FS)
136+
add_compile_definitions("SVN_LIBSVN_FS_LINKS_FS_FS")
137+
endif()
137138

138-
if (SVN_ENABLE_FS_X)
139-
add_compile_definitions("SVN_LIBSVN_FS_LINKS_FS_X")
139+
if (SVN_ENABLE_FS_X)
140+
add_compile_definitions("SVN_LIBSVN_FS_LINKS_FS_X")
141+
endif()
140142
endif()
141143

142144
if(SVN_ENABLE_AUTH_KWALLET)

0 commit comments

Comments
 (0)