Author: svn-role
Date: Sat Jul 4 04:00:11 2026
New Revision: 1935864
Log:
Merge r1933637 from trunk:
* r1933637
Fix building Python bindings with CMake.
Justification:
Build should not fail.
Votes:
+1: ivan, kotkov, dsahlberg
Modified:
subversion/branches/1.15.x/ (props changed)
subversion/branches/1.15.x/CMakeLists.txt
subversion/branches/1.15.x/STATUS
Modified: subversion/branches/1.15.x/CMakeLists.txt
==============================================================================
--- subversion/branches/1.15.x/CMakeLists.txt Sat Jul 4 00:45:03 2026
(r1935863)
+++ subversion/branches/1.15.x/CMakeLists.txt Sat Jul 4 04:00:11 2026
(r1935864)
@@ -386,12 +386,12 @@ endif()
### Python
if(SVN_ENABLE_SWIG_PYTHON)
- find_package(Python REQUIRED COMPONENTS
+ find_package(Python3 REQUIRED COMPONENTS
Interpreter
Development.Embed
)
elseif(SVN_ENABLE_TESTS)
- find_package(Python REQUIRED COMPONENTS
+ find_package(Python3 REQUIRED COMPONENTS
Interpreter
)
endif()
@@ -508,7 +508,7 @@ if(SVN_ENABLE_SWIG_PYTHON)
add_library(external-python INTERFACE)
target_link_libraries(external-python INTERFACE
- Python::Python
+ Python3::Python
Python::py3c
)
target_include_directories(external-python INTERFACE
Modified: subversion/branches/1.15.x/STATUS
==============================================================================
--- subversion/branches/1.15.x/STATUS Sat Jul 4 00:45:03 2026
(r1935863)
+++ subversion/branches/1.15.x/STATUS Sat Jul 4 04:00:11 2026
(r1935864)
@@ -95,13 +95,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1933637
- Fix building Python bindings with CMake.
- Justification:
- Build should not fail.
- Votes:
- +1: ivan, kotkov, dsahlberg
-
* r1934466
Fix detection for zlib version in vcxproj build on Windows.
Justification: