Skip to content

Commit ba2836f

Browse files
committed
cmake: Implement GPG Agent support.
We currently considering that all non-Windows platforms have the stuff for it. If it failing or not working, the SVN_ENABLE_AUTH_GPG_AGENT option still could be disabled. * CMakeLists.txt (options): Declare SVN_ENABLE_AUTH_GPG_AGENT as a reversely dependent option on the value of the WIN32 variable, in order to make it OFF on Windows and 'ON' on Linux and other platforms, since they should have everything required for this feature. (gpg_agent): Enable SVN_HAVE_GPG_AGENT if SVN_ENABLE_AUTH_GPG_AGENT is ON. (configure summary): Write whether GPG Agent is enabled or not. git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1921261 13f79535-47bb-0310-9956-ffa450edef68
1 parent df2748f commit ba2836f

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

CMakeLists.txt

+6
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ option(SVN_ENABLE_FS_BASE "Enable Subversion Filesystem Base Library (NOT IMPLEM
9191
option(SVN_ENABLE_NLS "Enable gettext functionality" OFF)
9292
option(SVN_ENABLE_AUTH_KWALLET "Enable KWallet auth library" OFF)
9393
option(SVN_ENABLE_AUTH_GNOME_KEYRING "Enable GNOME Keyring for auth credentials" OFF)
94+
cmake_dependent_option(SVN_ENABLE_AUTH_GPG_AGENT "Enable GPG Agent support" OFF "WIN32" ON)
9495

9596
option(SVN_INSTALL_PRIVATE_H "Install private header files." OFF)
9697

@@ -147,6 +148,10 @@ if(SVN_ENABLE_AUTH_KWALLET)
147148
add_compile_definitions("SVN_HAVE_KWALLET")
148149
endif()
149150

151+
if(SVN_ENABLE_AUTH_GPG_AGENT)
152+
add_compile_definitions("SVN_HAVE_GPG_AGENT")
153+
endif()
154+
150155
if (SVN_DEBUG)
151156
add_compile_definitions("SVN_DEBUG")
152157
endif()
@@ -790,6 +795,7 @@ message(STATUS " Build tools ................... : ${SVN_ENABLE_TOOLS}")
790795
message(STATUS " Build test suite .............. : ${SVN_ENABLE_TESTS}")
791796
message(STATUS " Enable KWallet integration .... : ${SVN_ENABLE_AUTH_KWALLET}")
792797
message(STATUS " Enable Gnome Keyring .......... : ${SVN_ENABLE_AUTH_GNOME_KEYRING}")
798+
message(STATUS " Enable GPG Agent support ...... : ${SVN_ENABLE_AUTH_GPG_AGENT}")
793799
message(STATUS " Install:")
794800
message(STATUS " Install prefix: ............... : ${CMAKE_INSTALL_PREFIX}")
795801
message(STATUS " Install private headers: ...... : ${SVN_INSTALL_PRIVATE_H}")

0 commit comments

Comments
 (0)