Source: k3d Version: 0.8.0.6-8 Severity: serious Tags: ftbfs Control: block 944417 by -1
Hi, the transition to CGAL 5.0 started (see bug #944417) and your package FTBFS. Attached are two patches that fix the problem. In addition, one needs to add "Build-Depends: libcgal-dev (>= 5.0~). But just applying these two patches is not enough to unblock the transition due to bug #946225. Best regards, Joachim
Index: k3d-0.8.0.6/CMakeLists.txt =================================================================== --- k3d-0.8.0.6.orig/CMakeLists.txt +++ k3d-0.8.0.6/CMakeLists.txt @@ -7,7 +7,7 @@ IF(${CMAKE_MAJOR_VERSION} GREATER 3 OR $ CMAKE_POLICY(SET CMP0026 OLD) ENDIF() -set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD 14) SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
Index: k3d-0.8.0.6/cmake/modules/K3DFindCGAL.cmake =================================================================== --- k3d-0.8.0.6.orig/cmake/modules/K3DFindCGAL.cmake +++ k3d-0.8.0.6/cmake/modules/K3DFindCGAL.cmake @@ -7,11 +7,6 @@ FIND_PATH(K3D_CGAL_INCLUDE_DIR CGAL ) MARK_AS_ADVANCED(K3D_CGAL_INCLUDE_DIR) -FIND_LIBRARY(K3D_CGAL_LIBRARY CGAL - DOC "The CGAL library" - ) -MARK_AS_ADVANCED(K3D_CGAL_LIBRARY) - FIND_LIBRARY(K3D_MPFR_LIBRARY mpfr DOC "The mpfr library" ) @@ -22,7 +17,7 @@ FIND_LIBRARY(K3D_GMP_LIBRARY gmp ) MARK_AS_ADVANCED(K3D_GMP_LIBRARY) -IF(K3D_CGAL_INCLUDE_DIR AND K3D_CGAL_LIBRARY AND K3D_MPFR_LIBRARY AND K3D_GMP_LIBRARY) +IF(K3D_CGAL_INCLUDE_DIR AND K3D_MPFR_LIBRARY AND K3D_GMP_LIBRARY) SET(K3D_CGAL_FOUND 1) -ENDIF(K3D_CGAL_INCLUDE_DIR AND K3D_CGAL_LIBRARY AND K3D_MPFR_LIBRARY AND K3D_GMP_LIBRARY) +ENDIF(K3D_CGAL_INCLUDE_DIR AND K3D_MPFR_LIBRARY AND K3D_GMP_LIBRARY) Index: k3d-0.8.0.6/modules/cgal/CMakeLists.txt =================================================================== --- k3d-0.8.0.6.orig/modules/cgal/CMakeLists.txt +++ k3d-0.8.0.6/modules/cgal/CMakeLists.txt @@ -6,7 +6,6 @@ K3D_BUILD_MODULE(k3d-cgal) K3D_CREATE_MODULE_PROXY(k3d-cgal) TARGET_LINK_LIBRARIES(k3d-cgal - ${K3D_CGAL_LIBRARY} ${K3D_MPFR_LIBRARY} ${K3D_GMP_LIBRARY} ${Boost_THREAD_LIBRARY}