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

fix Core dependancies

This commit is contained in:
Sébastien Loriot 2017-02-13 17:16:30 +01:00
parent 1fc9b0976a
commit 5212bb55a6
7 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,7 @@ macro(create_link_to_program COMPONENT )
endmacro() endmacro()
find_package(CGAL QUIET) find_package(CGAL QUIET COMPONENTS Core)
if ( CGAL_FOUND ) if ( CGAL_FOUND )

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

@ -8,7 +8,7 @@ cmake_minimum_required(VERSION 2.8.10)
find_package(CGAL QUIET COMPONENTS Core) find_package(CGAL QUIET COMPONENTS Core)
if ( CGAL_FOUND ) if ( CGAL_FOUND AND CGAL_Core_FOUND)
include( ${CGAL_USE_FILE} ) include( ${CGAL_USE_FILE} )
@ -26,7 +26,7 @@ if ( CGAL_FOUND )
else() 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() endif()

6
Kinetic_data_structures/examples/Kinetic_data_structures/CMakeLists.txt
View File

@ -6,9 +6,9 @@ project( Kinetic_data_structures_Examples )
cmake_minimum_required(VERSION 2.8.10) 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} ) include( ${CGAL_USE_FILE} )
@ -24,7 +24,7 @@ if ( CGAL_FOUND )
else() 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() endif()

6
Kinetic_framework/examples/Kinetic_framework/CMakeLists.txt
View File

@ -6,9 +6,9 @@ project( Kinetic_framework_Examples )
cmake_minimum_required(VERSION 2.8.10) 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} ) include( ${CGAL_USE_FILE} )
@ -22,7 +22,7 @@ if ( CGAL_FOUND )
else() 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() endif()

2
Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path_traits.h
View File

@ -170,6 +170,7 @@ std::ostream& operator<<(std::ostream& os, typename Surface_mesh_shortest_path_t
return os << b[0] << " " << b[1] << " " << b[2]; return os << b[0] << " " << b[1] << " " << b[2];
} }
#ifdef CGAL_SMSP_USE_ROBUST_TRAITS_CODE
#if defined(CGAL_USE_LEDA) || defined(CGAL_USE_CORE) #if defined(CGAL_USE_LEDA) || defined(CGAL_USE_CORE)
#ifndef DOXYGEN_RUNNING // needed due to a bug in doxygen #ifndef DOXYGEN_RUNNING // needed due to a bug in doxygen
/*! /*!
@ -219,6 +220,7 @@ public:
}; };
#endif #endif
#endif #endif
#endif
} // namespace CGAL } // namespace CGAL

7
Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/function_objects.h
View File

@ -25,9 +25,12 @@
#include <CGAL/Surface_mesh_shortest_path/internal/misc_functions.h> #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) #if defined(CGAL_USE_LEDA) || defined(CGAL_USE_CORE)
#include <CGAL/Exact_predicates_exact_constructions_kernel_with_sqrt.h> #include <CGAL/Exact_predicates_exact_constructions_kernel_with_sqrt.h>
#endif #endif
#endif
#include <CGAL/Cartesian_converter.h> #include <CGAL/Cartesian_converter.h>
#ifndef CGAL_SURFACE_MESH_SHORTEST_PATH_INTERNAL_FUNCTION_OBJECTS_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) #if defined(CGAL_USE_LEDA) || defined(CGAL_USE_CORE)
template<class K> template<class K>
class Robust_project_triangle_3_to_triangle_2 class Robust_project_triangle_3_to_triangle_2
@ -284,6 +288,7 @@ public:
} }
}; };
#endif #endif
#endif
template<class K> template<class K>
class Construct_triangle_3_along_segment_2_flattening 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) #if defined(CGAL_USE_LEDA) || defined(CGAL_USE_CORE)
template<class K> template<class K>
class Robust_flatten_triangle_3_along_segment_2 class Robust_flatten_triangle_3_along_segment_2
@ -410,6 +416,7 @@ public:
} }
}; };
#endif #endif
#endif
template <class K> template <class K>
class Compare_relative_intersection_along_segment_2 class Compare_relative_intersection_along_segment_2

10
Sweep_line_2/include/CGAL/Sweep_line_2_algorithms.h
View File

@ -37,10 +37,8 @@
#include <CGAL/Arr_segment_traits_2.h> #include <CGAL/Arr_segment_traits_2.h>
#include <CGAL/Arr_polyline_traits_2.h> #include <CGAL/Arr_polyline_traits_2.h>
#include <CGAL/Arr_conic_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_circle_segment_traits_2.h>
#include <CGAL/Arr_linear_traits_2.h> #include <CGAL/Arr_linear_traits_2.h>
#include <CGAL/Arr_rat_arc/Rational_arc_d_1.h>
namespace CGAL { namespace CGAL {
@ -75,6 +73,14 @@ struct Default_arr_traits<CGAL::_Conic_arc_2<Rat_kernel_, Alg_kernel_,
Traits; 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_> template <typename Algebraic_kernel_>
struct Default_arr_traits<CGAL::Arr_rational_arc::Rational_arc_d_1<Algebraic_kernel_> > struct Default_arr_traits<CGAL::Arr_rational_arc::Rational_arc_d_1<Algebraic_kernel_> >
{ {