songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update rules for using/finding core

This commit is contained in:
Sébastien Loriot 2023-02-20 13:56:21 +01:00
parent c9c82b9a33
commit acbe714a14
4 changed files with 5 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Installation/CMakeLists.txt
View File

@ -941,7 +941,7 @@ if(CGAL_BRANCH_BUILD)
set(compile_options
"\
${CMAKE_CXX_FLAGS} -DCGAL_EIGEN3_ENABLED -DCGAL_PROFILE \
${CMAKE_CXX_FLAGS} -DCGAL_EIGEN3_ENABLED -DCGAL_PROFILE -DCGAL_USE_CORE \
${Qt5Widgets_DEFINITIONS} ${Qt5OpenGL_DEFINITIONS} ${Qt5Gui_DEFINITIONS} \
${Qt5OpenGL_EXECUTABLE_COMPILE_FLAGS} -fPIC \
${Qt5Gui_EXECUTABLE_COMPILE_FLAGS} \

14
Installation/cmake/modules/CGAL_SetupCGAL_CoreDependencies.cmake
View File

@ -18,9 +18,6 @@ endif()
set(CGAL_SetupCGAL_CoreDependencies_included TRUE)
#.rst:
# Used Modules
# ^^^^^^^^^^^^
# - :module:`CGAL_SetupGMP`
#
# Result Variables
# ^^^^^^^^^^^^^^^^
@ -29,13 +26,10 @@ set(CGAL_SetupCGAL_CoreDependencies_included TRUE)
#
# Set to `TRUE` if the dependencies of `CGAL_Core` were found.
if(NOT CGAL_DISABLE_GMP)
include(${CMAKE_CURRENT_LIST_DIR}/CGAL_SetupGMP.cmake)
if(GMP_FOUND)
set(CGAL_Core_FOUND TRUE)
set_property(GLOBAL PROPERTY CGAL_Core_FOUND TRUE)
endif()
endif()
# always found as it requires the minimal version of boost required by CGAL
set(CGAL_Core_FOUND TRUE)
set_property(GLOBAL PROPERTY CGAL_Core_FOUND TRUE)
#.rst:
#

13
Installation/cmake/modules/CGAL_SetupDependencies.cmake
View File

@ -1,13 +0,0 @@
include(${CMAKE_CURRENT_LIST_DIR}/CGAL_Macros.cmake)
if( (GMP_FOUND AND NOT MPFR_FOUND) OR (NOT GMP_FOUND AND MPFR_FOUND) )
message( FATAL_ERROR "CGAL needs for its full functionality both GMP and MPFR.")
endif()
if( NOT GMP_FOUND )
set(CGAL_NO_CORE ON)
message( STATUS "CGAL_Core needs GMP, cannot be configured.")
endif( NOT GMP_FOUND )
# finally setup Boost
include(${CMAKE_CURRENT_LIST_DIR}/CGAL_SetupBoost.cmake)

6
Installation/include/CGAL/Installation/internal/enable_third_party_libraries.h
View File

@ -27,18 +27,12 @@
#if defined(__has_include) && ( ! defined _MSC_VER || _MSC_VER > 1900)
# if CGAL_USE_GMP && ! __has_include(<gmp.h>)
# pragma CGAL_WARNING("<gmp.h> cannot be found. Less efficient number types will be used instead. Define CGAL_NO_GMP=1 if that is on purpose.")
# undef CGAL_USE_GMP
# undef CGAL_USE_MPFR
# elif CGAL_USE_MPFR && ! __has_include(<mpfr.h>)
# pragma CGAL_WARNING("<mpfr.h> cannot be found and the GMP support in CGAL requires it. Less efficient number types will be used instead. Define CGAL_NO_GMP=1 if that is on purpose.")
# undef CGAL_USE_GMP
# undef CGAL_USE_MPFR
# endif // CGAL_USE_MPFR and no <mpfr.h>
#endif // __has_include
#if CGAL_USE_GMP && CGAL_USE_MPFR && ! CGAL_NO_CORE
# define CGAL_USE_CORE 1
#endif
#endif // CGAL_INTERNAL_ENABLE_THIRD_PARTY_LIBRARIES_H