Author: rinrab
Date: Tue Feb 3 16:49:29 2026
New Revision: 1931690
Log:
cmake: Use a simpler magic to enforce serf version requirements.
* CMakeLists.txt
(serf): Pass serf-1>=1.3.4 as package name so pkg_search_module() would take
care of version checking. Specify version when checking dependency via cmake.
They both will result an error if found version doesn't satisfy the
requirements. Removing old code that was doing that manually.
Modified:
subversion/trunk/CMakeLists.txt
Modified: subversion/trunk/CMakeLists.txt
==============================================================================
--- subversion/trunk/CMakeLists.txt Tue Feb 3 15:36:56 2026
(r1931689)
+++ subversion/trunk/CMakeLists.txt Tue Feb 3 16:49:29 2026
(r1931690)
@@ -377,17 +377,11 @@ endif()
### Serf
if (SVN_ENABLE_RA_SERF)
if(SVN_USE_PKG_CONFIG)
- pkg_search_module(serf IMPORTED_TARGET REQUIRED serf-2 serf-1)
+ pkg_search_module(serf IMPORTED_TARGET REQUIRED serf-2 serf-1>=1.3.4)
add_library(external-serf ALIAS PkgConfig::serf)
- set(DETECTED_SERF_VERSION "${serf_VERSION}")
else()
- find_package(Serf REQUIRED)
+ find_package(Serf REQUIRED 1.3.4)
add_library(external-serf ALIAS Serf::Serf)
- set(DETECTED_SERF_VERSION "${Serf_VERSION}")
- endif()
-
- if("${DETECTED_SERF_VERSION}" VERSION_LESS 1.3.4)
- message(FATAL_ERROR "Serf 1.3.4 or later required, found
${DETECTED_SERF_VERSION}")
endif()
endif()
