|
|
@ -247,7 +247,7 @@ if [ -z $CONFIGURATION ]; then
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
if [ -z $VS_VERSION ]; then
|
|
|
|
if [ -z $VS_VERSION ]; then
|
|
|
|
VS_VERSION="2013"
|
|
|
|
VS_VERSION="2017"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
case $VS_VERSION in
|
|
|
|
case $VS_VERSION in
|
|
|
@ -507,10 +507,10 @@ fi
|
|
|
|
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 has all the boost we need already
|
|
|
|
BOOST_SDK="c:/Libraries/boost_${BOOST_VER_URL}"
|
|
|
|
BOOST_SDK="c:/Libraries/boost_${BOOST_VER_URL}"
|
|
|
|
|
|
|
|
|
|
|
|
if [ $MSVC_REAL_VER -eq 15 ]; then
|
|
|
|
if [ $MSVC_REAL_VER -ge 15 ]; then
|
|
|
|
LIB_SUFFIX="1"
|
|
|
|
LIB_SUFFIX="1"
|
|
|
|
else
|
|
|
|
else
|
|
|
|
LIB_SUFFIX="0"
|
|
|
|
LIB_SUFFIX="0"
|
|
|
|