|
|
@ -418,22 +418,24 @@ fi
|
|
|
|
# Boost's installer is still based on ms-dos API that doesn't support larger than 260 char path names
|
|
|
|
# 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
|
|
|
|
# We work around this by installing to root of the current working drive and then move it to our deps
|
|
|
|
# get the current working drive's root, we'll install to that temporarily
|
|
|
|
# get the current working drive's root, we'll install to that temporarily
|
|
|
|
CWD_DRIVE_ROOT="$(powershell -command '(get-location).Drive.Root')"
|
|
|
|
CWD_DRIVE_ROOT="$(powershell -command '(get-location).Drive.Root')Boost_temp"
|
|
|
|
|
|
|
|
CWD_DRIVE_ROOT_BASH=$(echo "$CWD_DRIVE_ROOT" | sed "s,\\\\,/,g" | sed "s,\(.\):,/\\1,")
|
|
|
|
|
|
|
|
if [ -d CWD_DRIVE_ROOT_BASH ]; then
|
|
|
|
|
|
|
|
printf "Cannot continue, ${CWD_DRIVE_ROOT_BASH} aka ${CWD_DRIVE_ROOT} already exists. Please remove before re-running. ";
|
|
|
|
|
|
|
|
exit 1;
|
|
|
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
if [ -d Boost ] && grep "BOOST_VERSION 106700" Boost/boost/version.hpp > /dev/null; then
|
|
|
|
if [ -d ${BOOST_SDK} ] && grep "BOOST_VERSION 106700" 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
|
|
|
|
[ -n "$CI" ] && CI_EXTRA_INNO_OPTIONS="//SUPPRESSMSGBOXES //LOG='boost_install.log'"
|
|
|
|
[ -n "$CI" ] && CI_EXTRA_INNO_OPTIONS="//SUPPRESSMSGBOXES //LOG='boost_install.log'"
|
|
|
|
"${DEPS}/boost-1.67.0-msvc${MSVC_YEAR}-win${BITS}.exe" //DIR="${CWD_DRIVE_ROOT}Boost_temp" //VERYSILENT //NORESTART ${CI_EXTRA_INNO_OPTIONS}
|
|
|
|
"${DEPS}/boost-1.67.0-msvc${MSVC_YEAR}-win${BITS}.exe" //DIR="${CWD_DRIVE_ROOT}" //VERYSILENT //NORESTART ${CI_EXTRA_INNO_OPTIONS}
|
|
|
|
mv "${CWD_DRIVE_ROOT}Boost_temp" "${BOOST_SDK}"
|
|
|
|
mv "${CWD_DRIVE_ROOT_BASH}" "${BOOST_SDK}"
|
|
|
|
|
|
|
|
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \
|
|
|
|
add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \
|
|
|
|
-DBOOST_LIBRARYDIR="${BOOST_SDK}/lib${BITS}-msvc-${MSVC_VER}"
|
|
|
|
-DBOOST_LIBRARYDIR="${BOOST_SDK}/lib${BITS}-msvc-${MSVC_VER}"
|
|
|
|
add_cmake_opts -DBoost_COMPILER="-${TOOLSET}"
|
|
|
|
add_cmake_opts -DBoost_COMPILER="-${TOOLSET}"
|
|
|
|
|
|
|
|
|
|
|
|
echo Done.
|
|
|
|
echo Done.
|
|
|
|
else
|
|
|
|
else
|
|
|
|
# Appveyor unstable has all the boost we need already
|
|
|
|
# Appveyor unstable has all the boost we need already
|
|
|
|