mirror of https://github.com/CGAL/cgal
Merge pull request #3501 from lrineau/CGAL-fix_with_LEDA_without_CGAL_Core-GF
Partially fix the testsuite with LEDA instead of GMP
This commit is contained in:
commit
7cf4a1fff8
|
|
@ -128,7 +128,9 @@ if ( CGAL_FOUND )
|
|||
set(CGAL_IPELETS ${CGAL_IPELETS} circle_pencils)
|
||||
set(CGAL_IPELETS ${CGAL_IPELETS} hyperbolic)
|
||||
set(CGAL_IPELETS ${CGAL_IPELETS} distance)
|
||||
if(CGAL_Core_FOUND)
|
||||
set(CGAL_IPELETS ${CGAL_IPELETS} cone_spanners)
|
||||
endif()
|
||||
|
||||
|
||||
if ( IPELET_INSTALL_DIR )
|
||||
|
|
@ -149,7 +151,9 @@ if ( CGAL_FOUND )
|
|||
endif ()
|
||||
cgal_add_compilation_test(CGAL_${IPELET})
|
||||
endforeach(IPELET)
|
||||
if(CGAL_Core_FOUND)
|
||||
target_link_libraries(CGAL_cone_spanners PRIVATE CGAL::CGAL_Core)
|
||||
endif()
|
||||
#example in doc not installed
|
||||
add_library(simple_triangulation MODULE simple_triangulation.cpp)
|
||||
add_to_cached_list(CGAL_EXECUTABLE_TARGETS simple_triangulation)
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ function(use_CGAL_LEDA_support target)
|
|||
return()
|
||||
endif()
|
||||
separate_arguments(LIST_LEDA_CXX_FLAGS UNIX_COMMAND "${LEDA_CXX_FLAGS}")
|
||||
separate_arguments(LIST_LEDA_DEFINITIONS UNIX_COMMAND "${LEDA_DEFINITIONS}")
|
||||
separate_arguments(LIST_LEDA_DEFINITIONS UNIX_COMMAND "${LEDA_DEFINITIONS} -DCGAL_USE_LEDA")
|
||||
|
||||
if(CMAKE_VERSION VERSION_LESS 3.3)
|
||||
target_compile_options(${target} ${keyword} ${LIST_LEDA_CXX_FLAGS})
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ cmake_minimum_required(VERSION 3.1)
|
|||
|
||||
find_package(CGAL QUIET COMPONENTS Core)
|
||||
|
||||
if ( CGAL_FOUND AND CGAL_Core_FOUND)
|
||||
if ( CGAL_FOUND )
|
||||
|
||||
include(${CGAL_USE_FILE})
|
||||
include_directories (BEFORE "include")
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@
|
|||
#ifndef CGAL_PRECISE_NUMBERS_H
|
||||
#define CGAL_PRECISE_NUMBERS_H
|
||||
|
||||
#include <CGAL/config.h>
|
||||
#if defined CGAL_USE_GMPXX
|
||||
# include <CGAL/gmpxx.h>
|
||||
typedef mpz_class Precise_integer;
|
||||
|
|
|
|||
Loading…
Reference in New Issue