mirror of https://github.com/CGAL/cgal
fix Core dependancies
This commit is contained in:
Sébastien Loriot
parent
1fc9b0976a
commit
5212bb55a6
|
|
@ -26,7 +26,7 @@ macro(create_link_to_program COMPONENT )
|
|||
|
||||
endmacro()
|
||||
|
||||
find_package(CGAL QUIET)
|
||||
find_package(CGAL QUIET COMPONENTS Core)
|
||||
|
||||
if ( CGAL_FOUND )
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ cmake_minimum_required(VERSION 2.8.10)
|
|||
|
||||
find_package(CGAL QUIET COMPONENTS Core)
|
||||
|
||||
if ( CGAL_FOUND )
|
||||
if ( CGAL_FOUND AND CGAL_Core_FOUND)
|
||||
|
||||
include( ${CGAL_USE_FILE} )
|
||||
|
||||
|
|
@ -26,7 +26,7 @@ if ( CGAL_FOUND )
|
|||
|
||||
else()
|
||||
|
||||
message(STATUS "This program requires the CGAL library, and will not be compiled.")
|
||||
message(STATUS "This program requires the CGAL and CGAL_Core libraries, and will not be compiled.")
|
||||
|
||||
endif()
|
||||
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@ project( Kinetic_data_structures_Examples )
|
|||
|
||||
cmake_minimum_required(VERSION 2.8.10)
|
||||
|
||||
find_package(CGAL QUIET)
|
||||
find_package(CGAL QUIET COMPONENTS Core)
|
||||
|
||||
if ( CGAL_FOUND )
|
||||
if ( CGAL_FOUND AND CGAL_Core_FOUND)
|
||||
|
||||
include( ${CGAL_USE_FILE} )
|
||||
|
||||
|
|
@ -24,7 +24,7 @@ if ( CGAL_FOUND )
|
|||
|
||||
else()
|
||||
|
||||
message(STATUS "This program requires the CGAL library, and will not be compiled.")
|
||||
message(STATUS "This program requires the CGAL and the CGAL_Core libraries, and will not be compiled.")
|
||||
|
||||
endif()
|
||||
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@ project( Kinetic_framework_Examples )
|
|||
|
||||
cmake_minimum_required(VERSION 2.8.10)
|
||||
|
||||
find_package(CGAL QUIET)
|
||||
find_package(CGAL QUIET COMPONENTS Core)
|
||||
|
||||
if ( CGAL_FOUND )
|
||||
if ( CGAL_FOUND AND CGAL_Core_FOUND)
|
||||
|
||||
include( ${CGAL_USE_FILE} )
|
||||
|
||||
|
|
@ -22,7 +22,7 @@ if ( CGAL_FOUND )
|
|||
|
||||
else()
|
||||
|
||||
message(STATUS "This program requires the CGAL library, and will not be compiled.")
|
||||
message(STATUS "This program requires the CGAL and CGAL_Core libraries, and will not be compiled.")
|
||||
|
||||
endif()
|
||||
|
||||
|
|
|
|||
|
|
@ -170,6 +170,7 @@ std::ostream& operator<<(std::ostream& os, typename Surface_mesh_shortest_path_t
|
|||
return os << b[0] << " " << b[1] << " " << b[2];
|
||||
}
|
||||
|
||||
#ifdef CGAL_SMSP_USE_ROBUST_TRAITS_CODE
|
||||
#if defined(CGAL_USE_LEDA) || defined(CGAL_USE_CORE)
|
||||
#ifndef DOXYGEN_RUNNING // needed due to a bug in doxygen
|
||||
/*!
|
||||
|
|
@ -219,6 +220,7 @@ public:
|
|||
};
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
} // namespace CGAL
|
||||
|
||||
|
|
|
|||
|
|
@ -25,9 +25,12 @@
|
|||
|
||||
#include <CGAL/Surface_mesh_shortest_path/internal/misc_functions.h>
|
||||
|
||||
#ifdef CGAL_SMSP_USE_ROBUST_TRAITS_CODE
|
||||
#if defined(CGAL_USE_LEDA) || defined(CGAL_USE_CORE)
|
||||
#include <CGAL/Exact_predicates_exact_constructions_kernel_with_sqrt.h>
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#include <CGAL/Cartesian_converter.h>
|
||||
|
||||
#ifndef CGAL_SURFACE_MESH_SHORTEST_PATH_INTERNAL_FUNCTION_OBJECTS_H
|
||||
|
|
@ -253,6 +256,7 @@ public:
|
|||
}
|
||||
};
|
||||
|
||||
#ifdef CGAL_SMSP_USE_ROBUST_TRAITS_CODE
|
||||
#if defined(CGAL_USE_LEDA) || defined(CGAL_USE_CORE)
|
||||
template<class K>
|
||||
class Robust_project_triangle_3_to_triangle_2
|
||||
|
|
@ -284,6 +288,7 @@ public:
|
|||
}
|
||||
};
|
||||
#endif
|
||||
#endif
|
||||
|
||||
template<class K>
|
||||
class Construct_triangle_3_along_segment_2_flattening
|
||||
|
|
@ -377,6 +382,7 @@ public:
|
|||
}
|
||||
};
|
||||
|
||||
#ifdef CGAL_SMSP_USE_ROBUST_TRAITS_CODE
|
||||
#if defined(CGAL_USE_LEDA) || defined(CGAL_USE_CORE)
|
||||
template<class K>
|
||||
class Robust_flatten_triangle_3_along_segment_2
|
||||
|
|
@ -410,6 +416,7 @@ public:
|
|||
}
|
||||
};
|
||||
#endif
|
||||
#endif
|
||||
|
||||
template <class K>
|
||||
class Compare_relative_intersection_along_segment_2
|
||||
|
|
|
|||
|
|
@ -37,10 +37,8 @@
|
|||
#include <CGAL/Arr_segment_traits_2.h>
|
||||
#include <CGAL/Arr_polyline_traits_2.h>
|
||||
#include <CGAL/Arr_conic_traits_2.h>
|
||||
#include <CGAL/Arr_rational_function_traits_2.h>
|
||||
#include <CGAL/Arr_circle_segment_traits_2.h>
|
||||
#include <CGAL/Arr_linear_traits_2.h>
|
||||
#include <CGAL/Arr_rat_arc/Rational_arc_d_1.h>
|
||||
|
||||
namespace CGAL {
|
||||
|
||||
|
|
@ -75,6 +73,14 @@ struct Default_arr_traits<CGAL::_Conic_arc_2<Rat_kernel_, Alg_kernel_,
|
|||
Traits;
|
||||
};
|
||||
|
||||
template <typename AlgebraicKernel_d_1>
|
||||
class Arr_rational_function_traits_2;
|
||||
|
||||
namespace Arr_rational_arc{
|
||||
template <typename Algebraic_kernel_>
|
||||
class Rational_arc_d_1;
|
||||
}
|
||||
|
||||
template <typename Algebraic_kernel_>
|
||||
struct Default_arr_traits<CGAL::Arr_rational_arc::Rational_arc_d_1<Algebraic_kernel_> >
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue