Re: svn commit: r1936296 - subversion/trunk

Hi Jun,

Is this and/or r1936288 something that should be backported for 1.15.0?
From the descriptions, it seems like they are required for a successful
build on Windows and I think it would be good to have them in the release.
Or maybe it is enough that they are backported "at a convenient time".

Cheers,
Daniel


Den lör 18 juli 2026 kl 20:22 skrev <[email protected]>:

> Author: jun66j5
> Date: Sat Jul 18 18:21:13 2026
> New Revision: 1936296
>
> Log:
> cmake: Fix the compile options for swig-pl.
>
> * CMakeLists.txt
>   (swig-pl): Add `swigutil_pl__pre_perl.h` as forced includes for the MSVC
>   compiler, instead of adding `__inline__=__inline` macro.
>   See also `_find_perl` method in build/generator/gen_win_dependencies.py.
>
> Modified:
>    subversion/trunk/CMakeLists.txt
>
> Modified: subversion/trunk/CMakeLists.txt
>
> ==============================================================================
> --- subversion/trunk/CMakeLists.txt     Sat Jul 18 15:32:22 2026
> (r1936295)
> +++ subversion/trunk/CMakeLists.txt     Sat Jul 18 18:21:13 2026
> (r1936296)
> @@ -844,8 +844,10 @@ if(SVN_ENABLE_SWIG_PERL)
>      ${SWIG_INCLUDE_DIRECTORIES}
>
>  ${CMAKE_CURRENT_SOURCE_DIR}/subversion/bindings/swig/perl/libsvn_swig_perl
>    )
> -  target_compile_definitions(external-perl INTERFACE
> "__inline__=__inline")
> -  target_compile_options(external-perl INTERFACE ${PERL_EXTRA_C_FLAGS})
> +  target_compile_options(external-perl INTERFACE
> +    $<$<C_COMPILER_ID:MSVC>:/FIswigutil_pl__pre_perl.h>
> +    ${PERL_EXTRA_C_FLAGS}
> +  )
>    target_link_libraries(external-perl INTERFACE ${PERL_LIBRARY})
>
>    swig_target_external_runtime(external-perl perl)
>
>