Merge branch 'master' into CGAL-add_missing_test

# Conflicts:
#	STL_Extension/test/STL_Extension/test_skiplist.cpp

Scripts/developer_scripts/cgal_create_release_with_cmake.cmake

@@ -164,6 +164,9 @@ file(COPY ${GIT_REPO}/GraphicsView/demo/resources ${GIT_REPO}/GraphicsView/demo/
 #copy data
 file(COPY ${GIT_REPO}/Data/data DESTINATION "${release_dir}/")
 
+#copy LICENSES files
+file(COPY ${GIT_REPO}/LICENSES DESTINATION "${release_dir}/" PATTERN "GPL-2.0-only.txt" EXCLUDE)
+
 #create VERSION
 file(WRITE ${release_dir}/VERSION "${CGAL_VERSION}")
 

Scripts/developer_scripts/run_testsuite_with_ctest

@@ -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()
 {
@@ -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
@@ -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