From: Luca Heltai Date: Tue, 3 May 2022 20:05:54 +0000 (+0200) Subject: Make sure we use recent versions of CGAL. X-Git-Tag: v9.4.0-rc1~284^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=926318c69d99a7c911641c6e99cef7a530a683a4;p=dealii.git Make sure we use recent versions of CGAL. --- diff --git a/cmake/modules/FindCGAL.cmake b/cmake/modules/FindCGAL.cmake index 8262f941a7..494bd72d13 100644 --- a/cmake/modules/FindCGAL.cmake +++ b/cmake/modules/FindCGAL.cmake @@ -31,12 +31,13 @@ ENDIF() IF(DEAL_II_HAVE_CXX17) # temporarily disable ${CMAKE_SOURCE_DIR}/cmake/modules for module lookup LIST(REMOVE_ITEM CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules/) - FIND_PACKAGE(CGAL) + FIND_PACKAGE(CGAL 5.0) LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules/) - IF(CGAL_HEADER_ONLY) + IF(NOT CGAL_HEADER_ONLY) SET(CGAL_LIBS "-NOTFOUND") - ELSE(CGAL_HEADER_ONLY) - SET(CGAL_LIBS "${CGAL_CONFIGURED_LIBRARIES}") + MESSAGE(STATUS "CGAL wrappers require header only version of CGAL.") + ELSE() + SET(CGAL_LIBS CGAL::CGAL) ENDIF(CGAL_HEADER_ONLY) ELSE(DEAL_II_HAVE_CXX17) SET(CGAL_FOUND FALSE)