>
> Revert most of the changes in svn_utf.h from r1926293. Instead, tell the
> CMake build to expose APR and APR-Util include paths everywhere.
>
> (...)
>
> * CMakeLists.txt: Add APR and APR-Util include paths to the top-level
> directory properties.
>
(...)
> --- subversion/trunk/CMakeLists.txt (original)
> +++ subversion/trunk/CMakeLists.txt Wed Jun 11 15:40:43 2025
> @@ -289,6 +289,12 @@ else()
> endif()
> endif()
>
> +# APR and APR-Util include directories must be available to all our
> souroces,
> +# not just those that happen to link with one or the other of these
> libraries.
> +get_target_property(_apr_include external-apr
> INTERFACE_INCLUDE_DIRECTORIES)
> +get_target_property(_apu_include external-aprutil
> INTERFACE_INCLUDE_DIRECTORIES)
> +include_directories(${_apr_include} ${_apu_include})
> +
>
This is wrong. You can't modify global include directories of the entire
project to force it to use apr everywhere. This is a hack, not a fix.
(...)
--
Timofei Zhakov
