disable MSVC 2015 starting with CGAL 6.0
This commit is contained in:
@@ -105,6 +105,13 @@ collect_all_current_platforms()
|
||||
build_platforms_list()
|
||||
{
|
||||
for LOCAL_PLATFORM in $1; do
|
||||
# MSVC2015 does not support C++17
|
||||
if [ $1 \> "CGAL-6.0" ]; then
|
||||
if [ "LOCAL_PLATFORM" = "MSVC2015-Release-64bits" ]; then
|
||||
continue
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "${LOCAL_PLATFORM}" = "all" ] ; then
|
||||
USE_REFERENCE_PLATFORMS='y'
|
||||
else
|
||||
@@ -116,7 +123,7 @@ build_platforms_list()
|
||||
|
||||
# ----------------------------------------------------------------------------------------
|
||||
# Sets up the variables indicating the directories to use.
|
||||
# Crates all platform directories under the current release binary folder.
|
||||
# Creates all platform directories under the current release binary folder.
|
||||
# ----------------------------------------------------------------------------------------
|
||||
setup_dirs()
|
||||
{
|
||||
@@ -170,8 +177,8 @@ setup_dirs()
|
||||
# directories existing in the reference release are added to $PLATFORMS
|
||||
#
|
||||
PLATFORMS=""
|
||||
build_platforms_list "`value_of BUILD_ON_${HOST}`"
|
||||
build_platforms_list "`value_of COMPILERS_${HOST}`"
|
||||
build_platforms_list "`value_of BUILD_ON_${HOST}`" "${CGAL_RELEASE_ID}"
|
||||
build_platforms_list "`value_of COMPILERS_${HOST}`" "${CGAL_RELEASE_ID}"
|
||||
|
||||
if [ -n "${USE_REFERENCE_PLATFORMS}" ]; then
|
||||
collect_all_reference_platforms
|
||||
@@ -214,17 +221,17 @@ put_demos_on_web()
|
||||
collect_demos_binaries()
|
||||
{
|
||||
PLATFORM=${1}
|
||||
|
||||
|
||||
cd "${CGAL_TEST_DIR}"
|
||||
|
||||
echo "COLLECT_DEMOS_BINARIES=$COLLECT_DEMOS_BINARIES"
|
||||
if [ -n "$COLLECT_DEMOS_BINARIES" ]; then
|
||||
echo 'COLLECTING DEMOS BINARIES'
|
||||
|
||||
|
||||
|
||||
DEMOS_TEST_DIR="${CGAL_DIR}/cmake/platforms/${PLATFORM}/test"
|
||||
cp "${CGAL_DIR}/${SCRIPTS_DIR}developer_scripts/cgal_demo_copy_all_dlls_cygwin.sh" "${DEMOS_TEST_DIR}"
|
||||
|
||||
|
||||
cd ${DEMOS_TEST_DIR}
|
||||
|
||||
for demo_dir in *_Demo; do
|
||||
|
||||
Reference in New Issue
Block a user