Commit a5947dee authored by Ghislain MARY's avatar Ghislain MARY

Fix PATH variable for MinGW.

parent ac9ff8a7
......@@ -76,8 +76,7 @@ else()
file(READ "${CMAKE_CURRENT_BINARY_DIR}/windowsenv_path.txt" EP_vpx_ENV_PATH_LIST)
set(EP_vpx_ENV_PATH "")
foreach(P ${EP_vpx_ENV_PATH_LIST})
string(REPLACE "C:" "/c" P ${P})
string(REPLACE "c:" "/c" P ${P})
string(REGEX REPLACE "^([a-zA-Z]):(.*)$" "/\\1\\2" P ${P})
string(REPLACE "\\" "/" P ${P})
set(EP_vpx_ENV_PATH "${EP_vpx_ENV_PATH}:${P}")
endforeach()
......
......@@ -53,6 +53,8 @@ if(MSVC AND NOT WINDOWS_UNIVERSAL)
endif()
set(CMAKE_PROGRAM_PATH "${CMAKE_BINARY_DIR}/programs")
string(REGEX REPLACE "^([a-zA-Z]):(.*)$" "/\\1\\2" AUTOTOOLS_PROGRAM_PATH "${CMAKE_PROGRAM_PATH}")
string(REPLACE "\\" "/" AUTOTOOLS_PROGRAM_PATH ${AUTOTOOLS_PROGRAM_PATH})
file(MAKE_DIRECTORY ${CMAKE_PROGRAM_PATH})
file(COPY "${CMAKE_CURRENT_LIST_DIR}/../scripts/gas-preprocessor.pl" DESTINATION "${CMAKE_PROGRAM_PATH}")
if(WIN32)
......
......@@ -28,7 +28,7 @@ CXXFLAGS="@ep_cxxflags@"
OBJCFLAGS="@ep_objcflags@"
LDFLAGS="@ep_ldflags@"
export PATH="@CMAKE_PROGRAM_PATH@:$PATH"
export PATH="@AUTOTOOLS_PROGRAM_PATH@:$PATH"
export PKG_CONFIG="@LINPHONE_BUILDER_PKG_CONFIG@"
export PKG_CONFIG_PATH="@LINPHONE_BUILDER_PKG_CONFIG_PATH@"
export PKG_CONFIG_LIBDIR="@LINPHONE_BUILDER_PKG_CONFIG_LIBDIR@"
......
......@@ -28,7 +28,7 @@ CXXFLAGS="@ep_cxxflags@"
OBJCFLAGS="@ep_objcflags@"
LDFLAGS="@ep_ldflags@"
export PATH="@CMAKE_PROGRAM_PATH@:$PATH"
export PATH="@AUTOTOOLS_PROGRAM_PATH@:$PATH"
export PKG_CONFIG="@LINPHONE_BUILDER_PKG_CONFIG@"
export PKG_CONFIG_PATH="@LINPHONE_BUILDER_PKG_CONFIG_PATH@"
export PKG_CONFIG_LIBDIR="@LINPHONE_BUILDER_PKG_CONFIG_LIBDIR@"
......
......@@ -28,7 +28,7 @@ CXXFLAGS="@ep_cxxflags@"
OBJCFLAGS="@ep_objcflags@"
LDFLAGS="@ep_ldflags@"
export PATH="@CMAKE_PROGRAM_PATH@:$PATH"
export PATH="@AUTOTOOLS_PROGRAM_PATH@:$PATH"
export PKG_CONFIG="@LINPHONE_BUILDER_PKG_CONFIG@"
export PKG_CONFIG_PATH="@LINPHONE_BUILDER_PKG_CONFIG_PATH@"
export PKG_CONFIG_LIBDIR="@LINPHONE_BUILDER_PKG_CONFIG_LIBDIR@"
......
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