Skip to content

Commit

Permalink
Disable MSVC 2015 starting with CGAL 6.0 (#7538)
Browse files Browse the repository at this point in the history
Follow up of #7519 that was not done on the right file
  • Loading branch information
sloriot authored Jul 7, 2023
2 parents 6098856 + 404bc84 commit 602d022
Showing 1 changed file with 11 additions and 4 deletions.
15 changes: 11 additions & 4 deletions Scripts/developer_scripts/run_testsuite_with_ctest
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,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()
{
Expand Down Expand Up @@ -179,6 +179,13 @@ setup_dirs()

for PLATFORM in ${PLATFORMS}; do

# MSVC2015 does not support C++17
if [ "${CGAL_RELEASE_ID}" \> "CGAL-6.0" ]; then
if [ "${PLATFORM}" = "MSVC2015-Release-64bits" ]; then
continue
fi
fi

CGAL_BINARY_DIR=${CGAL_BINARY_DIR_BASE}/${PLATFORM}

if [ ! -d "${CGAL_BINARY_DIR}" ]; then
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 602d022

Please sign in to comment.