Source: yade Version: 2019.01a-3 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~). Just applying these two patches is not enough due to bug #938859. What is your planned timeline for an upload to unstable? Best regards, Joachim -- System Information: Debian Release: 10.2 APT prefers stable-debug APT policy: (800, 'stable-debug'), (800, 'stable'), (700, 'testing-debug'), (700, 'testing') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.19.0-6-amd64 (SMP w/4 CPU cores) Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE=en_US:en (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system)
Index: yade-2019.01a/CMakeLists.txt =================================================================== --- yade-2019.01a.orig/CMakeLists.txt +++ yade-2019.01a/CMakeLists.txt @@ -299,7 +299,7 @@ IF(ENABLE_CGAL) FILE(GLOB CGAL_SRC_LIB "lib/triangulation/*.cpp") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CGAL_DEFINITIONS} -DYADE_CGAL") - SET(LINKLIBS "${LINKLIBS};${CGAL_LIBRARIES};${GMP_LIBRARIES};${GMPXX_LIBRARIES};") + SET(LINKLIBS "${LINKLIBS};${GMP_LIBRARIES};${GMPXX_LIBRARIES};") MESSAGE(STATUS "Found CGAL") SET(CONFIGURED_FEATS "${CONFIGURED_FEATS} CGAL") Index: yade-2019.01a/cMake/FindCGAL.cmake =================================================================== --- yade-2019.01a.orig/cMake/FindCGAL.cmake +++ yade-2019.01a/cMake/FindCGAL.cmake @@ -7,38 +7,26 @@ # This module defines # CGAL_DEFINITIONS: compiler flags for compiling with CGAL # CGAL_INCLUDE_DIR: where to find CGAL.h -# CGAL_LIBRARIES: the libraries needed to use CGAL # CGAL_FOUND: if false, do not try to use CGAL -IF(CGAL_INCLUDE_DIR AND CGAL_LIBRARIES) +IF(CGAL_INCLUDE_DIR) SET(CGAL_FOUND TRUE) -ELSE(CGAL_INCLUDE_DIR AND CGAL_LIBRARIES) +ELSE(CGAL_INCLUDE_DIR) FIND_PATH(CGAL_INCLUDE_DIR CGAL/basic.h /usr/include/ /usr/local/include/ $ENV{ProgramFiles}/CGAL/*/include/ $ENV{SystemDrive}/CGAL/*/include/ ) - FIND_LIBRARY(CGAL_LIBRARIES NAMES CGAL libCGAL - PATHS - /usr/lib - /usr/local/lib - /usr/lib/CGAL - /usr/lib64 - /usr/local/lib64 - /usr/lib64/CGAL - $ENV{ProgramFiles}/CGAL/*/lib/ms - $ENV{SystemDrive}/CGAL/*/lib/ms - ) - IF(CGAL_INCLUDE_DIR AND CGAL_LIBRARIES) + IF(CGAL_INCLUDE_DIR) SET(CGAL_FOUND TRUE) - MESSAGE(STATUS "Found CGAL: ${CGAL_INCLUDE_DIR}, ${CGAL_LIBRARIES}") + MESSAGE(STATUS "Found CGAL: ${CGAL_INCLUDE_DIR}") INCLUDE_DIRECTORIES(${CGAL_INCLUDE_DIR}) - ELSE(CGAL_INCLUDE_DIR AND CGAL_LIBRARIES) + ELSE(CGAL_INCLUDE_DIR) SET(CGAL_FOUND FALSE) MESSAGE(STATUS "CGAL not found.") - ENDIF(CGAL_INCLUDE_DIR AND CGAL_LIBRARIES) + ENDIF(CGAL_INCLUDE_DIR) - MARK_AS_ADVANCED(CGAL_INCLUDE_DIR CGAL_LIBRARIES) -ENDIF(CGAL_INCLUDE_DIR AND CGAL_LIBRARIES) + MARK_AS_ADVANCED(CGAL_INCLUDE_DIR) +ENDIF(CGAL_INCLUDE_DIR)
Index: yade-2019.01a/CMakeLists.txt =================================================================== --- yade-2019.01a.orig/CMakeLists.txt +++ yade-2019.01a/CMakeLists.txt @@ -32,6 +32,8 @@ project(Yade C CXX) cmake_minimum_required(VERSION 2.8.11) +set(CMAKE_CXX_STANDARD 14) + set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cMake") INCLUDE(FindPythonInterp) @@ -83,7 +85,7 @@ ELSE() ENDIF() ENDIF() -SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -O2 --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -Wall -std=c++11") +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -O2 --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -Wall -std=c++14") IF (DEBUG) SET(CMAKE_VERBOSE_MAKEFILE 1)