Author: svn-role
Date: Wed May 20 04:00:13 2026
New Revision: 1934420
Log:
Merge the r1934265 group from trunk:
* r1934265, r1934266, r1934271, r1934276
INSTALL: CMake isn't just in trunk anymore; tell Windows users about it
Justification:
Improve build documentation
Votes:
+1: dsahlberg, hartmannathan
Modified:
subversion/branches/1.15.x/ (props changed)
subversion/branches/1.15.x/INSTALL
subversion/branches/1.15.x/STATUS
Modified: subversion/branches/1.15.x/INSTALL
==============================================================================
--- subversion/branches/1.15.x/INSTALL Wed May 20 02:39:16 2026
(r1934419)
+++ subversion/branches/1.15.x/INSTALL Wed May 20 04:00:13 2026
(r1934420)
@@ -848,6 +848,11 @@ II. INSTALLATION
E. Building the Latest Source under Windows
----------------------------------------
+ Windows users may find it easier to build Subversion using CMake and
+ vcpkg (see section F below).
+
+ The following procedure does not use CMake or vcpkg.
+
E.1 Prerequisites
* Microsoft Visual Studio. Any recent (2005+) version containing the
@@ -1194,9 +1199,8 @@ II. INSTALLATION
F. Building using CMake
--------------------
- Get the sources, either a release tarball or by checking out the
- official repository. The CMake build system currently only exists in
- /trunk and it will be included in the 1.15 release.
+ Get the sources, either from a release tarball or by checking out the
+ official repository.
The process for building on Unix and Windows is the same.
@@ -1204,11 +1208,14 @@ II. INSTALLATION
$ cmake -B out [build options]
$ cmake --build out
+ Note: If you're using the tarball distribution, the first gen-make step
+ can be skipped.
+
"out" in the commands above is the build directory used by CMake.
Build options can be added, for example:
- $ cmake -B out -DCMAKE_INSTALL_PREFIX=/usr/local/subversion
-DSVN_ENABLE_RA_SERF=ON
+ $ cmake -B out -DCMAKE_INSTALL_PREFIX=/usr/local/subversion
-DSVN_ENABLE_TESTS=ON
Build options can be listed using:
Modified: subversion/branches/1.15.x/STATUS
==============================================================================
--- subversion/branches/1.15.x/STATUS Wed May 20 02:39:16 2026
(r1934419)
+++ subversion/branches/1.15.x/STATUS Wed May 20 04:00:13 2026
(r1934420)
@@ -44,10 +44,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1934265, r1934266, r1934271, r1934276
- INSTALL: CMake isn't just in trunk anymore; tell Windows users about it
- Justification:
- Improve build documentation
- Votes:
- +1: dsahlberg, hartmannathan
