mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-07-12 17:21:42 +00:00
Update before_script.msvc.sh
Use powershell trick with boost_temp so there is little chance of collision.
This commit is contained in:
parent
8be52d228e
commit
4c0e475092
1 changed files with 7 additions and 2 deletions
|
@ -413,14 +413,19 @@ fi
|
||||||
if [ -z $APPVEYOR ]; then
|
if [ -z $APPVEYOR ]; then
|
||||||
cd $DEPS_INSTALL
|
cd $DEPS_INSTALL
|
||||||
|
|
||||||
|
# Boost's installer is still based on ms-dos API that doesn't support larger than 260 char path names
|
||||||
|
# We work around this by installing to root of the current working drive and then move it to our deps
|
||||||
|
|
||||||
BOOST_SDK="$(real_pwd)/Boost"
|
BOOST_SDK="$(real_pwd)/Boost"
|
||||||
|
CWD_DRIVE_ROOT=`powershell -command '(get-location).Drive.Root'` # get the current working drive's root
|
||||||
|
|
||||||
if [ -d Boost ] && grep "BOOST_VERSION 106100" Boost/boost/version.hpp > /dev/null; then
|
if [ -d Boost ] && grep "BOOST_VERSION 106100" Boost/boost/version.hpp > /dev/null; then
|
||||||
printf "Exists. "
|
printf "Exists. "
|
||||||
elif [ -z $SKIP_EXTRACT ]; then
|
elif [ -z $SKIP_EXTRACT ]; then
|
||||||
rm -rf Boost
|
rm -rf Boost
|
||||||
"${DEPS}/boost-1.67.0-msvc${MSVC_YEAR}-win${BITS}.exe" //DIR="${SYSTEMDRIVE}\boost" //VERYSILENT //NORESTART //SUPPRESSMSGBOXES //LOG="boost_install.log"
|
"${DEPS}/boost-1.67.0-msvc${MSVC_YEAR}-win${BITS}.exe" //DIR="${CWD_DRIVE_ROOT}Boost_temp" //VERYSILENT //NORESTART //SUPPRESSMSGBOXES //LOG="boost_install.log"
|
||||||
mv "${SYSTEMDRIVE}\boost" ${BOOST_SDK}
|
mv "${CWD_DRIVE_ROOT}Boost_temp" ${BOOST_SDK}
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \
|
add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \
|
||||||
|
|
Loading…
Reference in a new issue