Commit 0f60f80f authored by Julien Wadel's avatar Julien Wadel

Replacing characters was not applied to all path as the list were baldy build in Windows PATH

(cherry picked from commit a183b6fe)
parent d20ccbc0
......@@ -78,17 +78,23 @@ else()
)
file(READ "${CMAKE_CURRENT_BINARY_DIR}/windowsenv_path.txt" VPX_ENV_PATH_LIST)
set(VPX_ENV_PATH "")
string(REPLACE "\\;" ";" VPX_ENV_PATH_LIST "${VPX_ENV_PATH_LIST}") #Remove last \ before end dir
string(REPLACE " ;" ";" VPX_ENV_PATH_LIST "${VPX_ENV_PATH_LIST}") #Remove space before end dir
string(REPLACE "\\" "/" VPX_ENV_PATH_LIST "${VPX_ENV_PATH_LIST}") #Change \ into /
foreach(P ${VPX_ENV_PATH_LIST})
string(REGEX REPLACE "^([a-zA-Z]):(.*)$" "/\\1\\2" P ${P})
string(REPLACE "\\" "/" P ${P})
set(VPX_ENV_PATH "${VPX_ENV_PATH}:${P}")
string(REPLACE "\n" "" P ${P})
set(VPX_ENV_PATH "${VPX_ENV_PATH}:'${P}'") #Embed each path in quote
endforeach()
set(VPX_ENV_PATH "${VPX_ENV_PATH}:${AUTOTOOLS_PROGRAM_PATH}")
string(SUBSTRING ${VPX_ENV_PATH} 1 -1 VPX_ENV_PATH)
string(STRIP ${VPX_ENV_PATH} VPX_ENV_PATH)
file(READ "${CMAKE_CURRENT_BINARY_DIR}/windowsenv_include.txt" VPX_ENV_INCLUDE)
string(REPLACE "\n" "" VPX_ENV_INCLUDE "${VPX_ENV_INCLUDE}")
file(READ "${CMAKE_CURRENT_BINARY_DIR}/windowsenv_lib.txt" VPX_ENV_LIB)
string(REPLACE "\n" "" VPX_ENV_LIB "${VPX_ENV_LIB}")
file(READ "${CMAKE_CURRENT_BINARY_DIR}/windowsenv_libpath.txt" VPX_ENV_LIBPATH)
string(REPLACE "\n" "" VPX_ENV_LIBPATH "${VPX_ENV_LIBPATH}")
else()
set(VPX_TARGET "x86-win32-gcc")
endif()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment