Merge branch 'master' into python3

CGAL · Sep 18, 2023 · 93b3977 · 93b3977
2 parents 5a45e14 + f7fa571
commit 93b3977
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 13 deletions.
diff --git a/ArchLinux-CXX17-Release/init.cmake b/ArchLinux-CXX17-Release/init.cmake
@@ -1,4 +1,4 @@
-SET(CMAKE_CXX_FLAGS "-Wall -frounding-math -Wno-dangling-reference" CACHE STRING "")
+SET(CMAKE_CXX_FLAGS "-Wall -frounding-math -Wno-dangling-reference -Wno-maybe-uninitialized" CACHE STRING "")
 SET(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "")
 SET(CMAKE_CXX_FLAGS_RELEASE "-Wall -O3 -msse4.1 -std=gnu++17" CACHE STRING "")
 SET(CMAKE_BUILD_TYPE "Release" CACHE STRING "")
diff --git a/ArchLinux/init.cmake b/ArchLinux/init.cmake
@@ -1,4 +1,4 @@
-SET(CMAKE_CXX_FLAGS "-Wall -frounding-math -Wno-dangling-reference" CACHE STRING "")
+SET(CMAKE_CXX_FLAGS "-Wall -frounding-math -Wno-dangling-reference -Wno-maybe-uninitialized" CACHE STRING "")
 SET(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "")
 SET(CMAKE_CXX_FLAGS_RELEASE "" CACHE STRING "")
 SET(CMAKE_BUILD_TYPE "Debug" CACHE STRING "")

diff --git a/Fedora-32/init.cmake b/Fedora-32/init.cmake
@@ -1,4 +1,4 @@
-SET(CMAKE_CXX_FLAGS "-Wall -frounding-math -Wno-dangling-reference" CACHE STRING "")
+SET(CMAKE_CXX_FLAGS "-Wall -frounding-math -Wno-dangling-reference -Wno-maybe-uninitialized" CACHE STRING "")
 SET(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "")
 SET(CMAKE_CXX_FLAGS_RELEASE "" CACHE STRING "")
 SET(CMAKE_BUILD_TYPE "Debug" CACHE STRING "")

diff --git a/Fedora-Release/init.cmake b/Fedora-Release/init.cmake
@@ -1,4 +1,4 @@
-SET(CMAKE_CXX_FLAGS "-Wall -frounding-math -Wno-dangling-reference -msse3 -fsanitize=address" CACHE STRING "")
+SET(CMAKE_CXX_FLAGS "-Wall -frounding-math -Wno-dangling-reference -Wno-maybe-uninitialized -msse3 -fsanitize=address" CACHE STRING "")
 SET(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "")
 SET(CMAKE_CXX_FLAGS_RELEASE "-DCGAL_NDEBUG -O3" CACHE STRING "")
 SET(CMAKE_BUILD_TYPE "Release" CACHE STRING "")
diff --git a/Fedora-rawhide-Release/init.cmake b/Fedora-rawhide-Release/init.cmake
@@ -1,4 +1,4 @@
-SET(CMAKE_CXX_FLAGS "-Wall -frounding-math -Wno-dangling-reference" CACHE STRING "")
+SET(CMAKE_CXX_FLAGS "-Wall -frounding-math -Wno-dangling-reference -Wno-maybe-uninitialized -Wno-maybe-uninitialized" CACHE STRING "")
 SET(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "")
 SET(CMAKE_CXX_FLAGS_RELEASE "-DCGAL_NDEBUG -O3" CACHE STRING "")
 SET(CMAKE_BUILD_TYPE "Release" CACHE STRING "")
diff --git a/Fedora-rawhide/init.cmake b/Fedora-rawhide/init.cmake
@@ -1,4 +1,4 @@
-SET(CMAKE_CXX_FLAGS "-Wall -frounding-math -Wno-dangling-reference" CACHE STRING "")
+SET(CMAKE_CXX_FLAGS "-Wall -frounding-math -Wno-dangling-reference -Wno-maybe-uninitialized" CACHE STRING "")
 SET(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "")
 SET(CMAKE_CXX_FLAGS_RELEASE "" CACHE STRING "")
 SET(CMAKE_BUILD_TYPE "Debug" CACHE STRING "")

diff --git a/Fedora-with-LEDA/init.cmake b/Fedora-with-LEDA/init.cmake
@@ -1,4 +1,4 @@
-SET(CMAKE_CXX_FLAGS "-Wall -frounding-math -Wno-dangling-reference" CACHE STRING "")
+SET(CMAKE_CXX_FLAGS "-Wall -frounding-math -Wno-dangling-reference -Wno-maybe-uninitialized" CACHE STRING "")
 SET(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "")
 SET(CMAKE_CXX_FLAGS_RELEASE "-DCGAL_NDEBUG -O3" CACHE STRING "")
 SET(CMAKE_BUILD_TYPE "Release" CACHE STRING "")

diff --git a/Fedora/init.cmake b/Fedora/init.cmake
@@ -1,4 +1,4 @@
-SET(CMAKE_CXX_FLAGS "-Wall -frounding-math -Wno-dangling-reference" CACHE STRING "")
+SET(CMAKE_CXX_FLAGS "-Wall -frounding-math -Wno-dangling-reference -Wno-maybe-uninitialized" CACHE STRING "")
 SET(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "")
 SET(CMAKE_CXX_FLAGS_RELEASE "" CACHE STRING "")
 SET(CMAKE_BUILD_TYPE "Debug" CACHE STRING "")

diff --git a/Ubuntu-GCC6-CXX1Z/init.cmake b/Ubuntu-GCC6-CXX1Z/init.cmake
@@ -1,4 +1,4 @@
-SET(CMAKE_CXX_FLAGS "-DDONT_USE_BOOST_PROGRAM_OPTIONS -Wall -Wextra -Wno-dangling-reference -std=c++1z -frounding-math" CACHE STRING "")
+SET(CMAKE_CXX_FLAGS "-DDONT_USE_BOOST_PROGRAM_OPTIONS -Wall -Wextra -Wno-dangling-reference -Wno-maybe-uninitialized -std=c++1z -frounding-math" CACHE STRING "")
 SET(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "")
 SET(CMAKE_CXX_FLAGS_RELEASE "" CACHE STRING "")
 SET(CMAKE_BUILD_TYPE "Debug" CACHE STRING "")

diff --git a/Ubuntu-GCC6/init.cmake b/Ubuntu-GCC6/init.cmake
@@ -1,4 +1,4 @@
-SET(CMAKE_CXX_FLAGS "-DDONT_USE_BOOST_PROGRAM_OPTIONS -Wall -Wno-dangling-reference -Wno-expansion-to-defined -frounding-math" CACHE STRING "")
+SET(CMAKE_CXX_FLAGS "-DDONT_USE_BOOST_PROGRAM_OPTIONS -Wall -Wno-dangling-reference -Wno-maybe-uninitialized -Wno-expansion-to-defined -frounding-math" CACHE STRING "")
 SET(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "")
 SET(CMAKE_CXX_FLAGS_RELEASE "" CACHE STRING "")
 SET(CMAKE_BUILD_TYPE "Debug" CACHE STRING "")

diff --git a/Ubuntu-GCC_master_cpp20-Release/init.cmake b/Ubuntu-GCC_master_cpp20-Release/init.cmake
@@ -1,4 +1,4 @@
-SET(CMAKE_CXX_FLAGS "-DDONT_USE_BOOST_PROGRAM_OPTIONS -Wall -Wextra -Wno-dangling-reference -frounding-math  -std=c++2a" CACHE STRING "")
+SET(CMAKE_CXX_FLAGS "-DDONT_USE_BOOST_PROGRAM_OPTIONS -Wall -Wextra -Wno-dangling-reference -Wno-maybe-uninitialized -frounding-math  -std=c++2a" CACHE STRING "")
 SET(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "")
 SET(CMAKE_CXX_FLAGS_RELEASE "-DCGAL_NDEBUG -O3" CACHE STRING "")
 SET(CMAKE_BUILD_TYPE "Release" CACHE STRING "")

diff --git a/run-testsuite.sh b/run-testsuite.sh
@@ -103,14 +103,15 @@ touch "$RESULT_FILE"
 sed -n '/The CXX compiler/s/-- The CXX compiler identification is/COMPILER_VERSION =/p' < "${CGAL_TESTRESULTS}installation.log" |sed -E "s/ = (.*)/\ = '\1\'/">> "$RESULT_FILE"
 sed -n '/CGAL_VERSION /s/#define //p' < "${CGAL_RELEASE_DIR}include/CGAL/version.h" >> "$RESULT_FILE"
 echo "TESTER ${CGAL_TESTER}" >> "$RESULT_FILE"
-echo "TESTER_NAME ${CGAL_TESTER}" >> "$RESULT_FILE"
-echo "TESTER_ADDRESS ${TESTER_ADDRESS}" >> "$RESULT_FILE"
+echo "TESTER_NAME ${CGAL_TESTER_NAME}" >> "$RESULT_FILE"
+echo "TESTER_ADDRESS ${CGAL_TESTER_ADDRESS}" >> "$RESULT_FILE"
 echo "CGAL_TEST_PLATFORM ${PLATFORM}" >> "$RESULT_FILE"
 grep -e "^-- USING " "${CGAL_TESTRESULTS}installation.log"|sort -u >> $RESULT_FILE
 #Use sed to get the content of DEBUG or RELEASE CXX FLAGS so that Multiconfiguration platforms do provide their CXXXFLAGS to the testsuite page (that greps USING CXXFLAGS to get info)
 sed -i -E 's/(^-- USING )(DEBUG|RELEASE) (CXXFLAGS)/\1\3/' $RESULT_FILE
 echo "------------" >> "$RESULT_FILE"
 touch ../../../../../.scm-branch
+cat /mnt/testsuite/.scm-branch >> ../../../../../.scm-branch
 python3 ${CGAL_RELEASE_DIR}test/parse-ctest-dashboard-xml.py $CGAL_TESTER $PLATFORM
 
 for file in $(ls|grep _Tests); do