On Sun, Feb 1, 2026 at 4:35 AM Nathan Hartman <[email protected]> wrote:
> On Sat, Jan 31, 2026 at 5:17 PM <[email protected]> wrote: > >> Author: rinrab >> Date: Sat Jan 31 22:16:57 2026 >> New Revision: 1931635 >> >> Log: >> cmake: Make sure that serf is checked as a REQUIRED dependency. >> >> - Tested that current trunk will successfully configure when using serf >> though >> pkcconfig even when removing the serf-1.pc itself. Errors will only >> reveal >> after executing the build. After this change, an explicit error message >> is >> shown. >> >> (now i have to restore it...) >> >> * CMakeLists.txt >> (serf): Call pkg_search_module() with REQUIRED argument and remove >> unnecessary condition. >> >> Reviewed by: dsahlberg >> >> Modified: >> subversion/trunk/CMakeLists.txt >> >> Modified: subversion/trunk/CMakeLists.txt >> >> ============================================================================== >> --- subversion/trunk/CMakeLists.txt Sat Jan 31 20:10:02 2026 >> (r1931634) >> +++ subversion/trunk/CMakeLists.txt Sat Jan 31 22:16:57 2026 >> (r1931635) >> @@ -374,11 +374,8 @@ endif() >> ### Serf >> if (SVN_ENABLE_RA_SERF) >> if(SVN_USE_PKG_CONFIG) >> - pkg_search_module(serf IMPORTED_TARGET serf-2 serf-1) >> - >> - if(serf_FOUND) >> - add_library(external-serf ALIAS PkgConfig::serf) >> - endif() >> + pkg_search_module(serf IMPORTED_TARGET REQUIRED serf-2 serf-1) >> + add_library(external-serf ALIAS PkgConfig::serf) >> else() >> find_package(Serf REQUIRED) >> add_library(external-serf ALIAS Serf::Serf) >> >> > Hi, > > I may have missed what the motivation was for this change, but according > to INSTALL, Serf is optional for client, always has been as far as I > remember. So was Neon before we started using Serf. That allows to build a > client that cannot access repositories over http(s) but can access > repositories through the other schemes such as local and svn protocol. > Requiring Serf for CMake builds would be inconsistent with the autotools > build. Do we plan to make Serf a required dependency in the autotools build > as well? > > > Yes, as Daniel already mentioned, this code is nested in a condition. In cmake, most of the features require explicit options. Serf is enabled by default, but this could be changed by passing -DSVN_ENABLE_RA_SERF=OFF to configuration. It might have been unclear in the log message... -- Timofei Zhakov
