Bug#1074116: mshr: FTBFS with CGAL 6.0

[Joachim Reichel]

Source: mshr
Version: 2019.2.0~git20200924.c27eb18+dfsg1-7
Severity: normal
Tags: ftbfs
X-Debbugs-Cc: reichel at debian.org

Dear maintainer,

your package fails to build with cgal 6.0~beta1-1, which has recently been
uploaded to experimental. See [1] for the release notes with breaking changes.

[1] https://github.com/CGAL/cgal/releases/tag/v6.0-beta1

Some issues can be fixed just by requiring C++17 (see attached patch). I did
not investigate what is required to adapt to the changes related to
boost::optional/variant.

Best regards,
  Joachim
-------------- next part --------------
Index: mshr-2019.2.0~git20230811.ff54a68+dfsg1/CMakeLists.txt
===================================================================
--- mshr-2019.2.0~git20230811.ff54a68+dfsg1.orig/CMakeLists.txt
+++ mshr-2019.2.0~git20230811.ff54a68+dfsg1/CMakeLists.txt
@@ -14,7 +14,7 @@ endif()
 # CGAL setup
 option(USE_SYSTEM_CGAL "Do not build CGAL, but use an existing build instead." OFF)
 if (USE_SYSTEM_CGAL)
-  find_package(CGAL 5 CONFIG REQUIRED)
+  find_package(CGAL 6 CONFIG REQUIRED)
 endif()
 
 # Borrow some cmake modules from cgal
@@ -43,8 +43,8 @@ MACRO(LIST_CONTAINS var value)
   ENDFOREACH (value2)
 ENDMACRO(LIST_CONTAINS)
 
-# Use C++14 to support std:enable_if used by CGAL 5
-set(CMAKE_CXX_STANDARD 14)
+# Use C++17 as required by CGAL 6
+set(CMAKE_CXX_STANDARD 17)
 
 # Boost
 # This is workaround to avoid that find_package(Boost)
@@ -161,7 +161,7 @@ target_link_libraries( mshr
   )
 
 # CMAKE_CXX_STANDARD is ignored ;( Need to set standard manually here.
-set_property(TARGET mshr PROPERTY CXX_STANDARD 14)
+set_property(TARGET mshr PROPERTY CXX_STANDARD 17)
 
 # install library
 install(TARGETS mshr
@@ -181,7 +181,7 @@ if (ENABLE_MSHRABLE)
     )
 
 # CMAKE_CXX_STANDARD is ignored ;( Need to set standard manually here.
-set_property(TARGET mshrable PROPERTY CXX_STANDARD 14)
+set_property(TARGET mshrable PROPERTY CXX_STANDARD 17)
 
   # install app
   install(TARGETS mshrable
Index: mshr-2019.2.0~git20230811.ff54a68+dfsg1/python/setup.py
===================================================================
--- mshr-2019.2.0~git20230811.ff54a68+dfsg1.orig/python/setup.py
+++ mshr-2019.2.0~git20230811.ff54a68+dfsg1/python/setup.py
@@ -36,8 +36,8 @@ mshr_ext = Extension('mshr.cpp',
                      include_dirs=include_dirs,
                      library_dirs=config['mshr']['lib_dirs'].split(";"),
                      libraries=config['mshr']['libs'].split(";"),
-                     extra_compile_args=['-std=c++14'],
-                     language='c++14')
+                     extra_compile_args=['-std=c++17'],
+                     language='c++17')
 
 
 setup(name             = 'mshr',