Merge topic 'bootstrap-msys-paths'
5cd879c
bootstrap: Convert MSYS paths to Windows format (#13001)
This commit is contained in:
commit
b9beb660ea
10
bootstrap
10
bootstrap
|
@ -127,10 +127,20 @@ fi
|
||||||
cmake_bootstrap_dir="${cmake_binary_dir}/Bootstrap${_cmk}"
|
cmake_bootstrap_dir="${cmake_binary_dir}/Bootstrap${_cmk}"
|
||||||
|
|
||||||
# Helper function to fix windows paths.
|
# Helper function to fix windows paths.
|
||||||
|
case "${cmake_system}" in
|
||||||
|
*MINGW*)
|
||||||
|
cmake_fix_slashes()
|
||||||
|
{
|
||||||
|
cmd //c echo "$(echo "$1" | sed 's/\\/\//g')" | sed 's/^"//;s/" *$//'
|
||||||
|
}
|
||||||
|
;;
|
||||||
|
*)
|
||||||
cmake_fix_slashes()
|
cmake_fix_slashes()
|
||||||
{
|
{
|
||||||
echo "$1" | sed 's/\\/\//g'
|
echo "$1" | sed 's/\\/\//g'
|
||||||
}
|
}
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
# Choose the default install prefix.
|
# Choose the default install prefix.
|
||||||
if ${cmake_system_mingw}; then
|
if ${cmake_system_mingw}; then
|
||||||
|
|
Loading…
Reference in New Issue