From afd700dab98a7fc3e0d9a151b143e53f0438ce50 Mon Sep 17 00:00:00 2001 From: AnyOldName3 Date: Wed, 31 Oct 2018 23:38:10 +0000 Subject: [PATCH] Ensure different Boost versions get different names --- CI/before_script.msvc.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh index add6f0ace..dbfd44369 100644 --- a/CI/before_script.msvc.sh +++ b/CI/before_script.msvc.sh @@ -328,7 +328,7 @@ if [ -z $SKIP_DOWNLOAD ]; then if [ -z $APPVEYOR ]; then download "Boost 1.67.0" \ "https://sourceforge.net/projects/boost/files/boost-binaries/1.67.0/boost_1_67_0-msvc-${MSVC_VER}-${BITS}.exe" \ - "boost-1.67.0-msvc${MSVC_YEAR}-win${BITS}.exe" + "boost-1.67.0-msvc${MSVC_VER}-win${BITS}.exe" fi # Bullet @@ -434,7 +434,7 @@ fi rm -rf Boost CI_EXTRA_INNO_OPTIONS="" [ -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}" //VERYSILENT //NORESTART ${CI_EXTRA_INNO_OPTIONS} + "${DEPS}/boost-1.67.0-msvc${MSVC_VER}-win${BITS}.exe" //DIR="${CWD_DRIVE_ROOT}" //VERYSILENT //NORESTART ${CI_EXTRA_INNO_OPTIONS} mv "${CWD_DRIVE_ROOT_BASH}" "${BOOST_SDK}" fi add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \