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

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:
Laurent Rineau 2019-02-22 10:04:22 +00:00 committed by GitHub
parent a50ba04d40 a9ef1dd0a5
commit 7cf4a1fff8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CGAL_ipelets/demo/CGAL_ipelets/CMakeLists.txt
View File

@ -128,7 +128,9 @@ if ( CGAL_FOUND )
set(CGAL_IPELETS ${CGAL_IPELETS} circle_pencils) set(CGAL_IPELETS ${CGAL_IPELETS} circle_pencils)
set(CGAL_IPELETS ${CGAL_IPELETS} hyperbolic) set(CGAL_IPELETS ${CGAL_IPELETS} hyperbolic)
set(CGAL_IPELETS ${CGAL_IPELETS} distance) set(CGAL_IPELETS ${CGAL_IPELETS} distance)
set(CGAL_IPELETS ${CGAL_IPELETS} cone_spanners) if(CGAL_Core_FOUND)
set(CGAL_IPELETS ${CGAL_IPELETS} cone_spanners)
endif()
if ( IPELET_INSTALL_DIR ) if ( IPELET_INSTALL_DIR )
@ -149,7 +151,9 @@ if ( CGAL_FOUND )
endif () endif ()
cgal_add_compilation_test(CGAL_${IPELET}) cgal_add_compilation_test(CGAL_${IPELET})
endforeach(IPELET) endforeach(IPELET)
target_link_libraries(CGAL_cone_spanners PRIVATE CGAL::CGAL_Core) if(CGAL_Core_FOUND)
target_link_libraries(CGAL_cone_spanners PRIVATE CGAL::CGAL_Core)
endif()
#example in doc not installed #example in doc not installed
add_library(simple_triangulation MODULE simple_triangulation.cpp) add_library(simple_triangulation MODULE simple_triangulation.cpp)
add_to_cached_list(CGAL_EXECUTABLE_TARGETS simple_triangulation) add_to_cached_list(CGAL_EXECUTABLE_TARGETS simple_triangulation)

2
Installation/cmake/modules/CGAL_SetupLEDA.cmake
View File

@ -42,7 +42,7 @@ function(use_CGAL_LEDA_support target)
return() return()
endif() endif()
separate_arguments(LIST_LEDA_CXX_FLAGS UNIX_COMMAND "${LEDA_CXX_FLAGS}") 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) if(CMAKE_VERSION VERSION_LESS 3.3)
target_compile_options(${target} ${keyword} ${LIST_LEDA_CXX_FLAGS}) target_compile_options(${target} ${keyword} ${LIST_LEDA_CXX_FLAGS})

2
Kernel_23/test/Kernel_23/CMakeLists.txt
View File

@ -8,7 +8,7 @@ cmake_minimum_required(VERSION 3.1)
find_package(CGAL QUIET COMPONENTS Core) find_package(CGAL QUIET COMPONENTS Core)
if ( CGAL_FOUND AND CGAL_Core_FOUND) if ( CGAL_FOUND )
include(${CGAL_USE_FILE}) include(${CGAL_USE_FILE})
include_directories (BEFORE "include") include_directories (BEFORE "include")

1
Kernel_23/test/Kernel_23/include/CGAL/Precise_numbers.h
View File

@ -23,6 +23,7 @@
#ifndef CGAL_PRECISE_NUMBERS_H #ifndef CGAL_PRECISE_NUMBERS_H
#define CGAL_PRECISE_NUMBERS_H #define CGAL_PRECISE_NUMBERS_H
#include <CGAL/config.h>
#if defined CGAL_USE_GMPXX #if defined CGAL_USE_GMPXX
# include <CGAL/gmpxx.h> # include <CGAL/gmpxx.h>
typedef mpz_class Precise_integer; typedef mpz_class Precise_integer;