[ki18n] cmake: Fix the binary-factory builds.

[David Faure]

I just released ki18n v5.48.1 with the fix below.

AFAIU this really only matters on Windows, you can ignore this on Linux distros.

693cd37cbc21fe8e69214c9220502bb86453abce
70b884303a5e00277e07b1ae10221ebb4f1ff17bd39f0e41b519c7fdd4323d55  sources/ki18n-5.48.1.tar.xz

Cheers,
David.

On samedi 14 juillet 2018 11:47:03 CEST Christophe Giboudeaux wrote:
> Git commit c5b721dc1753f8ca3c5af06169425751379f635f by Christophe
> Giboudeaux. Committed on 14/07/2018 at 09:40.
> Pushed by cgiboudeaux into branch 'master'.
> 
> Fix the binary-factory builds.
> 
> The Python executable used for building ki18n may be elsewhere when building
> applications using the CMake macros. This is the case for our Windows build
> system.
> 
> We're now trying to find a Python executable before relying on the one used
> to build ki18n.
> 
> David, can you respin ki18n to add this change? Thanks!
> CCMAIL: faure at kde.org
> 
> M  +8    -1    cmake/KF5I18NMacros.cmake.in
> 
> https://commits.kde.org/ki18n/c5b721dc1753f8ca3c5af06169425751379f635f
> 
> diff --git a/cmake/KF5I18NMacros.cmake.in b/cmake/KF5I18NMacros.cmake.in
> index 4effa79..7e99468 100644
> --- a/cmake/KF5I18NMacros.cmake.in
> +++ b/cmake/KF5I18NMacros.cmake.in
> @@ -27,7 +27,14 @@
> 
>  find_package(Gettext REQUIRED)
> 
> -set(KI18N_PYTHON_EXECUTABLE "@PYTHON_EXECUTABLE@")
> +# The Python executable used for building ki18n will be used as a fallback
> +# solution if it cannot be found in $PATH when building applications.
> +set(_KI18N_PYTHON_EXECUTABLE "@PYTHON_EXECUTABLE@")
> +
> +find_program(KI18N_PYTHON_EXECUTABLE NAMES python3 python2 python)
> +if(NOT KI18N_PYTHON_EXECUTABLE)
> +    set(KI18N_PYTHON_EXECUTABLE "${_KI18N_PYTHON_EXECUTABLE}")
> +endif()
> 
>  set(_ki18n_pmap_compile_script
> ${CMAKE_CURRENT_LIST_DIR}/ts-pmap-compile.py) set(_ki18n_uic_script
> ${CMAKE_CURRENT_LIST_DIR}/kf5i18nuic.cmake)


-- 
David Faure, faure at kde.org, http://www.davidfaure.fr
Working on KDE Frameworks 5