Author: rinrab
Date: Mon May 4 16:03:53 2026
New Revision: 1933814
Log:
cmake: Process svn_private_config.h definitions and build type check for the
auth KWallet module directly in the SVN_ENABLE_AUTH_KWALLET block.
* CMakeLists.txt: small refactoring.
Modified:
subversion/trunk/CMakeLists.txt
Modified: subversion/trunk/CMakeLists.txt
==============================================================================
--- subversion/trunk/CMakeLists.txt Mon May 4 15:16:24 2026
(r1933813)
+++ subversion/trunk/CMakeLists.txt Mon May 4 16:03:53 2026
(r1933814)
@@ -178,17 +178,6 @@ if (SVN_ENABLE_FS_X)
)
endif()
-if(SVN_ENABLE_AUTH_KWALLET)
- if(NOT BUILD_SHARED_LIBS)
- message(SEND_ERROR "SVN_ENABLE_AUTH_KWALLET is not supported in static
build.")
- endif()
-
- add_private_config_definition(
- "Defined if KWallet support is enabled"
- "SVN_HAVE_KWALLET" "1"
- )
-endif()
-
if(SVN_ENABLE_AUTH_GPG_AGENT)
add_private_config_definition(
"Is GPG Agent support enabled?"
@@ -505,6 +494,10 @@ endif()
### KWallet
if(SVN_ENABLE_AUTH_KWALLET)
+ if(NOT BUILD_SHARED_LIBS)
+ message(SEND_ERROR "SVN_ENABLE_AUTH_KWALLET is not supported in static
build.")
+ endif()
+
find_package(KF5Wallet REQUIRED)
find_package(KF5CoreAddons REQUIRED)
find_package(KF5I18n REQUIRED)
@@ -520,6 +513,12 @@ if(SVN_ENABLE_AUTH_KWALLET)
dbus-1
)
target_compile_definitions(external-kwallet INTERFACE SVN_HAVE_KF5)
+
+ add_private_config_definition(
+ "Defined if KWallet support is enabled"
+ "SVN_HAVE_KWALLET" "1"
+ )
+
endif()
### GNOME Keyring
