merge changes from next

This commit is contained in:
Laurent Rineau 2012-01-27 12:55:23 +00:00
commit aa6184e8a1
32 changed files with 653 additions and 548 deletions

2
.gitattributes vendored
View File

@ -2163,6 +2163,8 @@ Maintenance/infrastructure/cgal.geometryfactory.com/reference-platforms/setup-co
Maintenance/infrastructure/delaunay.geometryfactory.com/.autocgalrc -text
Maintenance/infrastructure/delaunay.geometryfactory.com/reference-platforms/i686_Cygwin-Vista_MSVS2008-Release-32bits/setup -text
Maintenance/infrastructure/delaunay.geometryfactory.com/reference-platforms/x64_Cygwin-Vista_MSVS2010-64bits/setup -text
Maintenance/infrastructure/delaunay.geometryfactory.com/scripts/compile-boost-i686 -text
Maintenance/infrastructure/delaunay.geometryfactory.com/scripts/compile-boost-x64 -text
Maintenance/infrastructure/renoir.geometryfactory.com/.autocgalrc -text
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/setup-common -text
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/setup -text

11
.gitignore vendored
View File

@ -297,6 +297,17 @@ Maintenance/infrastructure/cgal.geometryfactory.com/reference-platforms/i686_Lin
Maintenance/infrastructure/cgal.geometryfactory.com/reference-platforms/i686_Linux-2.6_g++-4.3.3_CentOS-5.1/include
Maintenance/infrastructure/cgal.geometryfactory.com/reference-platforms/i686_Linux-2.6_g++-4.3.3_CentOS-5.1/lib
Maintenance/infrastructure/cgal.geometryfactory.com/reference-platforms/i686_Linux-2.6_g++-4.3.3_CentOS-5.1/src
Maintenance/infrastructure/delaunay.geometryfactory.com/reference-platforms/i686_Cygwin-Vista_MSVS2008-Release-32bits/CGALConfig.cmake
Maintenance/infrastructure/delaunay.geometryfactory.com/reference-platforms/i686_Cygwin-Vista_MSVS2008-Release-32bits/config
Maintenance/infrastructure/delaunay.geometryfactory.com/reference-platforms/i686_Cygwin-Vista_MSVS2008-Release-32bits/include
Maintenance/infrastructure/delaunay.geometryfactory.com/reference-platforms/i686_Cygwin-Vista_MSVS2008-Release-32bits/lib
Maintenance/infrastructure/delaunay.geometryfactory.com/reference-platforms/i686_Cygwin-Vista_MSVS2008-Release-32bits/src
Maintenance/infrastructure/delaunay.geometryfactory.com/reference-platforms/x64_Cygwin-Vista_MSVS2010-64bits/CGALConfig.cmake
Maintenance/infrastructure/delaunay.geometryfactory.com/reference-platforms/x64_Cygwin-Vista_MSVS2010-64bits/bin
Maintenance/infrastructure/delaunay.geometryfactory.com/reference-platforms/x64_Cygwin-Vista_MSVS2010-64bits/config
Maintenance/infrastructure/delaunay.geometryfactory.com/reference-platforms/x64_Cygwin-Vista_MSVS2010-64bits/include
Maintenance/infrastructure/delaunay.geometryfactory.com/reference-platforms/x64_Cygwin-Vista_MSVS2010-64bits/lib
Maintenance/infrastructure/delaunay.geometryfactory.com/reference-platforms/x64_Cygwin-Vista_MSVS2010-64bits/src
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/CGALConfig.cmake
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/CMakeCache.txt.backup
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/Makefile

View File

@ -19,24 +19,24 @@ typedef CGAL::Arrangement_with_history_2<Traits_2> Arr_with_hist_2;
typedef Arr_with_hist_2::Curve_handle Curve_handle;
typedef CGAL::Arr_simple_point_location<Arr_with_hist_2> Point_location;
int main ()
int main()
{
Arr_with_hist_2 arr;
// Insert s1, s2 and s3 incrementally:
Segment_2 s1 (Point_2 (0, 3), Point_2 (4, 3));
Curve_handle c1 = insert (arr, s1);
Segment_2 s2 (Point_2 (3, 2), Point_2 (3, 5));
Curve_handle c2 = insert (arr, s2);
Segment_2 s3 (Point_2 (2, 3), Point_2 (5, 3));
Curve_handle c3 = insert (arr, s3);
Segment_2 s1(Point_2(0, 3), Point_2(4, 3));
insert(arr, s1);
Segment_2 s2(Point_2(3, 2), Point_2(3, 5));
insert(arr, s2);
Segment_2 s3(Point_2(2, 3), Point_2(5, 3));
insert(arr, s3);
// Insert three additional segments aggregately:
Segment_2 segs[3];
segs[0] = Segment_2 (Point_2 (2, 6), Point_2 (7, 1));
segs[1] = Segment_2 (Point_2 (0, 0), Point_2 (2, 6));
segs[2] = Segment_2 (Point_2 (3, 4), Point_2 (6, 4));
insert (arr, segs, segs + 3);
Segment_2 segs[3];
segs[0] = Segment_2(Point_2(2, 6), Point_2(7, 1));
segs[1] = Segment_2(Point_2(0, 0), Point_2(2, 6));
segs[2] = Segment_2(Point_2(3, 4), Point_2(6, 4));
insert(arr, segs, segs + 3);
// Print out the curves and the number of edges each one induces.
Arr_with_hist_2::Curve_iterator cit;
@ -65,14 +65,14 @@ int main ()
}
// Perform some point-location queries:
Point_location pl (arr);
Point_location pl(arr);
Point_2 p1 (4, 6);
point_location_query (pl, p1);
Point_2 p2 (6, 2);
point_location_query (pl, p2);
Point_2 p3 (2, 4);
point_location_query (pl, p3);
Point_2 p1(4, 6);
point_location_query(pl, p1);
Point_2 p2(6, 2);
point_location_query(pl, p2);
Point_2 p3(2, 4);
point_location_query(pl, p3);
return 0;
}

View File

@ -16,26 +16,26 @@ typedef CGAL::Arrangement_2<Traits_2> Arrangement_2;
typedef Arrangement_2::Vertex_handle Vertex_handle;
typedef Arrangement_2::Halfedge_handle Halfedge_handle;
int main ()
int main()
{
Arrangement_2 arr;
Segment_2 s1 (Point_2 (1, 3), Point_2 (3, 5));
Segment_2 s2 (Point_2 (3, 5), Point_2 (5, 3));
Segment_2 s3 (Point_2 (5, 3), Point_2 (3, 1));
Segment_2 s4 (Point_2 (3, 1), Point_2 (1, 3));
Segment_2 s5 (Point_2 (1, 3), Point_2 (5, 3));
Segment_2 s1(Point_2(1, 3), Point_2(3, 5));
Segment_2 s2(Point_2(3, 5), Point_2(5, 3));
Segment_2 s3(Point_2(5, 3), Point_2(3, 1));
Segment_2 s4(Point_2(3, 1), Point_2(1, 3));
Segment_2 s5(Point_2(1, 3), Point_2(5, 3));
Halfedge_handle e1 = arr.insert_in_face_interior (s1, arr.unbounded_face());
Halfedge_handle e1 = arr.insert_in_face_interior(s1, arr.unbounded_face());
Vertex_handle v1 = e1->source();
Vertex_handle v2 = e1->target();
Halfedge_handle e2 = arr.insert_from_left_vertex (s2, v2);
Halfedge_handle e2 = arr.insert_from_left_vertex(s2, v2);
Vertex_handle v3 = e2->target();
Halfedge_handle e3 = arr.insert_from_right_vertex (s3, v3);
Halfedge_handle e3 = arr.insert_from_right_vertex(s3, v3);
Vertex_handle v4 = e3->target();
Halfedge_handle e4 = arr.insert_at_vertices (s4, v4, v1);
Halfedge_handle e5 = arr.insert_at_vertices (s5, v1, v3);
arr.insert_at_vertices(s4, v4, v1);
arr.insert_at_vertices(s5, v1, v3);
print_arrangement (arr);
print_arrangement(arr);
return 0;
}

View File

@ -3,81 +3,73 @@
#include <CGAL/basic.h>
#ifdef CGAL_USE_GMP
#include <CGAL/Gmpz.h>
typedef CGAL::Gmpz Number_type;
#else
#include <CGAL/MP_Float.h>
typedef CGAL::MP_Float Number_type;
#endif
#include <CGAL/Cartesian.h>
#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
#include <CGAL/Arr_segment_traits_2.h>
#include <CGAL/Arrangement_2.h>
#include "arr_print.h"
typedef CGAL::Cartesian<Number_type> Kernel;
typedef CGAL::Arr_segment_traits_2<Kernel> Traits_2;
typedef Traits_2::Point_2 Point_2;
typedef Traits_2::X_monotone_curve_2 Segment_2;
typedef CGAL::Arrangement_2<Traits_2> Arrangement_2;
typedef Arrangement_2::Vertex_handle Vertex_handle;
typedef Arrangement_2::Halfedge_handle Halfedge_handle;
typedef CGAL::Exact_predicates_exact_constructions_kernel Kernel;
typedef CGAL::Arr_segment_traits_2<Kernel> Traits_2;
typedef Traits_2::Point_2 Point_2;
typedef Traits_2::X_monotone_curve_2 Segment_2;
typedef CGAL::Arrangement_2<Traits_2> Arrangement_2;
typedef Arrangement_2::Vertex_handle Vertex_handle;
typedef Arrangement_2::Halfedge_handle Halfedge_handle;
int main ()
int main()
{
// Step (a) - construct a triangular face.
// Step(a) - construct a triangular face.
Arrangement_2 arr;
Segment_2 s1 (Point_2 (667, 1000), Point_2 (4000, 5000));
Segment_2 s2 (Point_2 (4000, 0), Point_2 (4000, 5000));
Segment_2 s3 (Point_2 (667, 1000), Point_2 (4000, 0));
Segment_2 s1(Point_2(667, 1000), Point_2(4000, 5000));
Segment_2 s2(Point_2(4000, 0), Point_2(4000, 5000));
Segment_2 s3(Point_2(667, 1000), Point_2(4000, 0));
Halfedge_handle e1 = arr.insert_in_face_interior (s1, arr.unbounded_face());
Halfedge_handle e1 = arr.insert_in_face_interior(s1, arr.unbounded_face());
Vertex_handle v1 = e1->source();
Vertex_handle v2 = e1->target();
Halfedge_handle e2 = arr.insert_from_right_vertex (s2, v2);
Halfedge_handle e2 = arr.insert_from_right_vertex(s2, v2);
Vertex_handle v3 = e2->target();
Halfedge_handle e3 = arr.insert_at_vertices (s3, v3, v1);
arr.insert_at_vertices(s3, v3, v1);
// Step (b) - create additional two faces inside the triangle.
Point_2 p1 (4000, 3666), p2 (4000, 1000);
Segment_2 s4 (Point_2 (4000, 5000), p1);
Segment_2 s5 (p1, p2);
Segment_2 s6 (Point_2 (4000, 0), p2);
Point_2 p1(4000, 3666), p2(4000, 1000);
Segment_2 s4(Point_2(4000, 5000), p1);
Segment_2 s5(p1, p2);
Segment_2 s6(Point_2(4000, 0), p2);
Halfedge_handle e4 = arr.split_edge(e2, s4, Segment_2 (Point_2(4000, 0), p1));
Halfedge_handle e4 = arr.split_edge(e2, s4, Segment_2(Point_2(4000, 0), p1));
Vertex_handle w1 = e4->target();
Halfedge_handle e5 = arr.split_edge (e4->next(), s5, s6);
Halfedge_handle e5 = arr.split_edge(e4->next(), s5, s6);
Vertex_handle w2 = e5->target();
Halfedge_handle e6 = e5->next();
Segment_2 s7 (p1, Point_2 (3000, 2666));
Segment_2 s8 (p2, Point_2 (3000, 1333));
Segment_2 s9 (Point_2 (3000, 2666), Point_2 (2000, 1666));
Segment_2 s10 (Point_2 (3000, 1333), Point_2 (2000, 1666));
Segment_2 s11 (Point_2 (3000, 1333), Point_2 (3000, 2666));
Segment_2 s7(p1, Point_2(3000, 2666));
Segment_2 s8(p2, Point_2(3000, 1333));
Segment_2 s9(Point_2(3000, 2666), Point_2(2000, 1666));
Segment_2 s10(Point_2(3000, 1333), Point_2(2000, 1666));
Segment_2 s11(Point_2(3000, 1333), Point_2(3000, 2666));
Halfedge_handle e7 = arr.insert_from_right_vertex (s7, w1);
Halfedge_handle e7 = arr.insert_from_right_vertex(s7, w1);
Vertex_handle v4 = e7->target();
Halfedge_handle e8 = arr.insert_from_right_vertex (s8, w2);
Halfedge_handle e8 = arr.insert_from_right_vertex(s8, w2);
Vertex_handle v5 = e8->target();
Vertex_handle v6 = arr.insert_in_face_interior (Point_2 (2000, 1666),
e8->face());
Vertex_handle v6 =
arr.insert_in_face_interior(Point_2(2000, 1666), e8->face());
arr.insert_at_vertices (s9, v4, v6);
arr.insert_at_vertices (s10, v5, v6);
arr.insert_at_vertices (s11, v4, v5);
arr.insert_at_vertices(s9, v4, v6);
arr.insert_at_vertices(s10, v5, v6);
arr.insert_at_vertices(s11, v4, v5);
// Step (c) - remove and merge faces to form a single hole in the traingle.
arr.remove_edge (e7);
arr.remove_edge (e8);
// Step(c) - remove and merge faces to form a single hole in the traingle.
arr.remove_edge(e7);
arr.remove_edge(e8);
e5 = arr.merge_edge (e5, e6, Segment_2 (e5->source()->point(),
e6->target()->point()));
e2 = arr.merge_edge (e4, e5, s2);
e5 = arr.merge_edge(e5, e6, Segment_2(e5->source()->point(),
e6->target()->point()));
e2 = arr.merge_edge(e4, e5, s2);
print_arrangement (arr);
print_arrangement(arr);
return 0;
}

View File

@ -2,12 +2,12 @@
// Perform a point-location query and print the result.
//
template <class PointLocation>
void point_location_query
(const PointLocation& pl,
const typename PointLocation::Arrangement_2::Point_2& q)
void point_location_query(const PointLocation& pl,
const typename
PointLocation::Arrangement_2::Point_2& q)
{
// Perform the point-location query.
CGAL::Object obj = pl.locate (q);
CGAL::Object obj = pl.locate(q);
// Print the result.
typedef typename PointLocation::Arrangement_2 Arrangement_2;
@ -17,7 +17,7 @@ void point_location_query
typename Arrangement_2::Face_const_handle f;
std::cout << "The point (" << q << ") is located ";
if (CGAL::assign (f, obj))
if (CGAL::assign(f, obj))
{
// q is located inside a face:
if (f->is_unbounded())
@ -25,12 +25,12 @@ void point_location_query
else
std::cout << "inside a bounded face." << std::endl;
}
else if (CGAL::assign (e, obj))
else if (CGAL::assign(e, obj))
{
// q is located on an edge:
std::cout << "on an edge: " << e->curve() << std::endl;
}
else if (CGAL::assign (v, obj))
else if (CGAL::assign(v, obj))
{
// q is located on a vertex:
if (v->is_isolated())
@ -42,20 +42,18 @@ void point_location_query
{
CGAL_error_msg( "Invalid object.");
}
return;
}
//-----------------------------------------------------------------------------
// Perform a vertical ray-shooting query and print the result.
//
template <class VerticalRayShoot>
void vertical_ray_shooting_query
(const VerticalRayShoot& vrs,
const typename VerticalRayShoot::Arrangement_2::Point_2& q)
void vertical_ray_shooting_query(const VerticalRayShoot& vrs,
const typename
VerticalRayShoot::Arrangement_2::Point_2& q)
{
// Perform the point-location query.
CGAL::Object obj = vrs.ray_shoot_up (q);
CGAL::Object obj = vrs.ray_shoot_up(q);
// Print the result.
typedef typename VerticalRayShoot::Arrangement_2 Arrangement_2;
@ -65,12 +63,12 @@ void vertical_ray_shooting_query
typename Arrangement_2::Face_const_handle f;
std::cout << "Shooting up from (" << q << ") : ";
if (CGAL::assign (e, obj))
if (CGAL::assign(e, obj))
{
// We hit an edge:
std::cout << "hit an edge: " << e->curve() << std::endl;
}
else if (CGAL::assign (v, obj))
else if (CGAL::assign(v, obj))
{
// We hit a vertex:
if (v->is_isolated())
@ -78,10 +76,10 @@ void vertical_ray_shooting_query
else
std::cout << "hit a vertex: " << v->point() << std::endl;
}
else if (CGAL::assign (f, obj))
else if (CGAL::assign(f, obj))
{
// We did not hit anything:
CGAL_assertion (f->is_unbounded());
CGAL_assertion(f->is_unbounded());
std::cout << "hit nothing." << std::endl;
}
@ -89,8 +87,6 @@ void vertical_ray_shooting_query
{
CGAL_error_msg( "Invalid object.");
}
return;
}
//-----------------------------------------------------------------------------
@ -100,22 +96,20 @@ void vertical_ray_shooting_query
// coordinates.
//
template <class Arrangement>
void construct_segments_arr (Arrangement& arr)
void construct_segments_arr(Arrangement& arr)
{
typedef typename Arrangement::Point_2 Point_2;
typedef typename Arrangement::X_monotone_curve_2 Segment_2;
typedef typename Arrangement::Halfedge_handle Halfedge_handle;
Point_2 p0 (3,2), p1 (0,3), p2 (2,5), p3 (4,5), p4 (6,3), p5 (3,0);
Segment_2 s1 (p1, p2), s2 (p2, p3), s3 (p3, p4), s4 (p4, p5), s5 (p5, p1);
Point_2 p0(3,2), p1(0,3), p2(2,5), p3(4,5), p4(6,3), p5(3,0);
Segment_2 s1(p1, p2), s2(p2, p3), s3(p3, p4), s4(p4, p5), s5(p5, p1);
arr.insert_in_face_interior (p0, arr.unbounded_face());
arr.insert_in_face_interior(p0, arr.unbounded_face());
Halfedge_handle e1 = arr.insert_in_face_interior (s1, arr.unbounded_face());
Halfedge_handle e2 = arr.insert_from_left_vertex (s2, e1->target());
Halfedge_handle e3 = arr.insert_from_left_vertex (s3, e2->target());
Halfedge_handle e4 = arr.insert_from_right_vertex (s4, e3->target());
Halfedge_handle e5 = arr.insert_at_vertices (s5, e4->target(), e1->source());
return;
Halfedge_handle e1 = arr.insert_in_face_interior(s1, arr.unbounded_face());
Halfedge_handle e2 = arr.insert_from_left_vertex(s2, e1->target());
Halfedge_handle e3 = arr.insert_from_left_vertex(s3, e2->target());
Halfedge_handle e4 = arr.insert_from_right_vertex(s4, e3->target());
arr.insert_at_vertices(s5, e4->target(), e1->source());
}

View File

@ -67,7 +67,7 @@ protected:
// Data members:
//! The topology-traits class
Topology_traits * m_top_traits;
Topology_traits* m_top_traits;
//! An arrangement accessor
Arr_accessor<Arrangement_2> m_arr_access;
@ -80,11 +80,11 @@ protected:
//! A pointer to a map of halfedges to indices lists
// (stored in the visitor class)
Halfedge_indices_map * m_he_ind_map_p;
Halfedge_indices_map* m_he_ind_map_p;
public:
/*! Constructor. */
Arr_spherical_construction_helper(Arrangement_2 * arr) :
Arr_spherical_construction_helper(Arrangement_2* arr) :
m_top_traits(arr->topology_traits()),
m_arr_access(*arr),
m_he_ind_map_p(NULL)
@ -106,7 +106,7 @@ public:
/*! A notification invoked before the sweep-line starts handling the given
* event.
*/
virtual void before_handle_event(Event * event)
virtual void before_handle_event(Event* event)
{
// Act according to the boundary type:
Arr_parameter_space ps_x = event->parameter_space_in_x();
@ -128,16 +128,13 @@ public:
// Check whether we have a vertex that corresponds to the south pole.
// If not, we create one.
if (m_top_traits->south_pole() == NULL)
{
if (m_top_traits->south_pole() == NULL) {
Vertex_handle v =
m_arr_access.create_boundary_vertex (xc, ind, ps_x, ps_y);
m_arr_access.create_boundary_vertex(xc, ind, ps_x, ps_y);
event->set_vertex_handle(v);
}
else
{
event->set_vertex_handle(Vertex_handle (m_top_traits->south_pole()));
}
event->set_vertex_handle(Vertex_handle(m_top_traits->south_pole()));
return;
}
@ -158,10 +155,9 @@ public:
// Check whether we have a vertex that corresponds to the north pole.
// If not, we create one.
if (m_top_traits->north_pole() == NULL)
{
if (m_top_traits->north_pole() == NULL) {
Vertex_handle v =
m_arr_access.create_boundary_vertex (xc, ind, ps_x, ps_y);
m_arr_access.create_boundary_vertex(xc, ind, ps_x, ps_y);
event->set_vertex_handle(v);
// Since this is the first event corresponding to the north pole,
@ -173,58 +169,50 @@ public:
// to later move them to another face.
m_subcurves_at_nf.clear();
}
else
{
event->set_vertex_handle(Vertex_handle (m_top_traits->north_pole()));
else {
event->set_vertex_handle(Vertex_handle(m_top_traits->north_pole()));
DHalfedge * dprev =
DHalfedge* dprev =
m_top_traits->locate_around_boundary_vertex(m_top_traits->
north_pole(), xc, ind,
ps_x, ps_y);
if (dprev != NULL)
{
if (dprev != NULL) {
Halfedge_handle prev = Halfedge_handle(dprev);
event->set_halfedge_handle(prev);
// Associate all curve indices of subcurves that "see" the top face
// from below with the left portion of the twin of the predecessor.
if (m_he_ind_map_p != NULL) {
Indices_list & list_ref = (*m_he_ind_map_p)[prev->twin()];
Indices_list& list_ref = (*m_he_ind_map_p)[prev->twin()];
list_ref.splice(list_ref.end(), m_subcurves_at_nf);
}
else
{
m_subcurves_at_nf.clear();
}
CGAL_assertion(m_subcurves_at_nf.empty());
}
return;
}
return;
}
if (ps_x == ARR_LEFT_BOUNDARY) {
// The event has only right curves.
CGAL_assertion(event->number_of_left_curves() == 0 &&
event->number_of_right_curves() == 1);
event->number_of_right_curves() >= 1);
const X_monotone_curve_2 & xc =
(*(event->right_curves_begin()))->last_curve();
DVertex * v = m_top_traits->discontinuity_vertex(xc, ARR_MIN_END);
DVertex* v = m_top_traits->discontinuity_vertex(xc, ARR_MIN_END);
// Check whether a corresponding vertex already exists on the line
// of discontinuity. If not, create one now.
if (v == NULL)
{
if (v == NULL) {
Vertex_handle vh =
m_arr_access.create_boundary_vertex (xc, ARR_MIN_END, ps_x, ps_y);
m_arr_access.create_boundary_vertex(xc, ARR_MIN_END, ps_x, ps_y);
event->set_vertex_handle(vh);
}
else
{
event->set_vertex_handle(Vertex_handle(v));
}
return;
}
@ -238,39 +226,33 @@ public:
// Check whether a corresponding vertex already exists on the line
// of discontinuity. If not, create one now.
if (v == NULL)
{
if (v == NULL) {
Vertex_handle vh =
m_arr_access.create_boundary_vertex (xc, ARR_MAX_END, ps_x, ps_y);
m_arr_access.create_boundary_vertex(xc, ARR_MAX_END, ps_x, ps_y);
event->set_vertex_handle(vh);
}
else
{
event->set_vertex_handle(Vertex_handle(v));
}
return;
}
}
/*! A notification invoked when a new subcurve is created. */
virtual void add_subcurve(Halfedge_handle he, Subcurve * sc) { return; }
virtual void add_subcurve(Halfedge_handle he, Subcurve* sc) { return; }
/*! Collect a subcurve index that does not see any status-line from below.
*/
void add_subcurve_in_top_face(unsigned int index)
{
m_subcurves_at_nf.push_back(index);
return;
}
{ m_subcurves_at_nf.push_back(index); }
/*! A notification invoked before the given event it deallocated. */
void before_deallocate_event(Event * event) { return; }
void before_deallocate_event(Event* event) { return; }
//@}
/*! Set the map that maps each halfedge to the list of subcurve indices
* that "see" the halfedge from below.
*/
void set_halfedge_indices_map(Halfedge_indices_map & table)
void set_halfedge_indices_map(Halfedge_indices_map& table)
{
m_he_ind_map_p = &table;
return;
@ -279,7 +261,7 @@ public:
/*! Determine if we should swap the order of predecessor halfedges when
* calling insert_at_vertices_ex() .
*/
bool swap_predecessors (Event * event) const
bool swap_predecessors(Event* event) const
{
// If we insert an edge whose right end lies on the north pole, we have
// to flip the order of predecessor halfegdes.

View File

@ -39,7 +39,7 @@ void Sweep_line_2<Tr, Vis, Subcv, Evnt, Alloc>::_init_structures()
Base::_init_structures();
// Resize the hash to be O(2*n), where n is the number of input curves.
m_curves_pair_set.resize (2 * this->m_num_of_subCurves);
m_curves_pair_set.resize(2 * this->m_num_of_subCurves);
}
//-----------------------------------------------------------------------------
@ -56,8 +56,7 @@ void Sweep_line_2<Tr, Vis, Subcv, Evnt, Alloc>::_complete_sweep()
// Free all overlapping subcurves we have created.
Subcurve_iterator itr;
for (itr = m_overlap_subCurves.begin();
itr != m_overlap_subCurves.end();
for (itr = m_overlap_subCurves.begin(); itr != m_overlap_subCurves.end();
++itr)
{
this->m_subCurveAlloc.destroy(*itr);
@ -71,14 +70,13 @@ void Sweep_line_2<Tr, Vis, Subcv, Evnt, Alloc>::_complete_sweep()
// Handle the subcurves to the left of the current event point.
//
template <class Tr, class Vis, class Subcv, class Evnt, typename Alloc>
void Sweep_line_2<Tr, Vis, Subcv, Evnt, Alloc>::_handle_left_curves ()
void Sweep_line_2<Tr, Vis, Subcv, Evnt, Alloc>::_handle_left_curves()
{
CGAL_PRINT("Handling left curve" << std::endl;);
this->m_is_event_on_above = false;
if (! this->m_currentEvent->has_left_curves())
{
if (! this->m_currentEvent->has_left_curves()) {
// In case the current event has no left subcurves incident to it, we have
// to locate a place for it in the status line.
CGAL_PRINT(" - handling special case " << std::endl;);
@ -86,18 +84,15 @@ void Sweep_line_2<Tr, Vis, Subcv, Evnt, Alloc>::_handle_left_curves ()
Status_line_iterator sl_pos = this->m_status_line_insert_hint;
if (this->m_is_event_on_above)
{
if (this->m_is_event_on_above) {
// The current event point starts at the interior of a subcurve that
// already exists in the status line (this may also indicate an overlap).
if (! this->m_currentEvent->has_right_curves())
{
if (! this->m_currentEvent->has_right_curves()) {
// The event is an isolated point.
if (this->m_currentEvent->is_query())
{
if (this->m_currentEvent->is_query()) {
// In case of a query point, just notify the visitor about it.
this->m_is_event_on_above = true;
this->m_visitor->before_handle_event (this->m_currentEvent);
this->m_visitor->before_handle_event(this->m_currentEvent);
return;
}
@ -109,8 +104,7 @@ void Sweep_line_2<Tr, Vis, Subcv, Evnt, Alloc>::_handle_left_curves ()
// Obtain the subcurve that contains the current event, and add it to
// the left curves incident to the event.
Subcurve *sc = static_cast<Subcurve*>(*(this->
m_status_line_insert_hint));
Subcurve* sc = static_cast<Subcurve*>(*(this->m_status_line_insert_hint));
const X_monotone_curve_2& last_curve = sc->last_curve();
this->m_currentEvent->set_weak_intersection();
@ -121,24 +115,21 @@ void Sweep_line_2<Tr, Vis, Subcv, Evnt, Alloc>::_handle_left_curves ()
// We also check for overlaps.
bool is_overlap = _add_curve_to_right(this->m_currentEvent, sc);
this->m_traits->split_2_object() (last_curve,
this->m_currentEvent->point(),
sub_cv1, sub_cv2);
this->m_traits->split_2_object()(last_curve,
this->m_currentEvent->point(),
sub_cv1, sub_cv2);
++(this->m_status_line_insert_hint);
if (is_overlap)
{
if (is_overlap) {
// Handle overlaps.
this->m_visitor->before_handle_event (this->m_currentEvent);
this->m_visitor->add_subcurve (sub_cv1, sc);
this->m_statusLine.erase (sl_pos);
this->m_visitor->before_handle_event(this->m_currentEvent);
this->m_visitor->add_subcurve(sub_cv1, sc);
this->m_statusLine.erase(sl_pos);
return;
}
}
else
{
else {
// The event is not located on any subcurve.
this->m_visitor->before_handle_event(this->m_currentEvent);
return;
@ -168,21 +159,18 @@ void Sweep_line_2<Tr, Vis, Subcv, Evnt, Alloc>::_handle_left_curves ()
Event_subcurve_iterator left_iter =
this->m_currentEvent->left_curves_begin();
while(left_iter != this->m_currentEvent->left_curves_end())
{
Subcurve *leftCurve = *left_iter;
while (left_iter != this->m_currentEvent->left_curves_end()) {
Subcurve* leftCurve = *left_iter;
if((Event*)leftCurve->right_event() == this->m_currentEvent)
{
if ((Event*)leftCurve->right_event() == this->m_currentEvent) {
// we are done with that subcurve (current event point is his right
// end point) so we remove it from the status line for good.
remove_for_good = true;
this->m_visitor->add_subcurve(leftCurve->last_curve(), leftCurve);
}
else
{
else {
// curren event splits the subcurve.
const X_monotone_curve_2 &lastCurve = leftCurve->last_curve();
const X_monotone_curve_2& lastCurve = leftCurve->last_curve();
this->m_traits->split_2_object()(lastCurve,
this->m_currentEvent->point(),
@ -198,21 +186,19 @@ void Sweep_line_2<Tr, Vis, Subcv, Evnt, Alloc>::_handle_left_curves ()
_remove_curve_from_status_line(leftCurve, remove_for_good);
}
CGAL_PRINT( "Handling left curve END" << std::endl;);
return;
}
//-----------------------------------------------------------------------------
// Handle the subcurves to the right of the current event point.
//
template <class Tr, class Vis, class Subcv, class Evnt, typename Alloc>
void Sweep_line_2<Tr, Vis, Subcv, Evnt, Alloc>::_handle_right_curves ()
void Sweep_line_2<Tr, Vis, Subcv, Evnt, Alloc>::_handle_right_curves()
{
CGAL_PRINT("Handling right curves (" ;);
CGAL_SL_DEBUG(this->PrintEvent(this->m_currentEvent););
CGAL_PRINT(")\n";);
if(! this->m_currentEvent->has_right_curves())
if (! this->m_currentEvent->has_right_curves())
return;
// Loop over the curves to the right of the status line and handle them:
@ -225,29 +211,26 @@ void Sweep_line_2<Tr, Vis, Subcv, Evnt, Alloc>::_handle_right_curves ()
Event_subcurve_iterator currentOne =
this->m_currentEvent->right_curves_begin();
Event_subcurve_iterator rightCurveEnd =
Event_subcurve_iterator rightCurveEnd =
this->m_currentEvent->right_curves_end();
CGAL_PRINT_INSERT(*currentOne);
Status_line_iterator slIter =
this->m_statusLine.insert_before (this->m_status_line_insert_hint,
*currentOne);
this->m_statusLine.insert_before(this->m_status_line_insert_hint,
*currentOne);
((Subcurve*)(*currentOne))->set_hint(slIter);
CGAL_SL_DEBUG(this->PrintStatusLine(););
if ( slIter != this->m_statusLine.begin() )
{
if (slIter != this->m_statusLine.begin()) {
// get the previous curve in the y-str
Status_line_iterator prev = slIter; --prev;
_intersect(static_cast<Subcurve*>(*prev),
static_cast<Subcurve*>(*slIter));
_intersect(static_cast<Subcurve*>(*prev), static_cast<Subcurve*>(*slIter));
}
Event_subcurve_iterator prevOne = currentOne;
++currentOne;
while (currentOne != rightCurveEnd)
{
while (currentOne != rightCurveEnd) {
CGAL_PRINT_INSERT(*currentOne);
slIter = this->m_statusLine.insert_before
(this->m_status_line_insert_hint, *currentOne);
@ -258,8 +241,7 @@ void Sweep_line_2<Tr, Vis, Subcv, Evnt, Alloc>::_handle_right_curves ()
// If the two curves used to be neighbours before, we do not need to
// intersect them again.
if (!this->m_currentEvent->are_left_neighbours
(static_cast<Subcurve*>(*currentOne),
static_cast<Subcurve*>(*prevOne)))
(static_cast<Subcurve*>(*currentOne), static_cast<Subcurve*>(*prevOne)))
{
_intersect(*prevOne, *currentOne);
}
@ -272,9 +254,9 @@ void Sweep_line_2<Tr, Vis, Subcv, Evnt, Alloc>::_handle_right_curves ()
//the next Subcurve at the status line
++slIter;
if ( slIter != this->m_statusLine.end() )
_intersect( static_cast<Subcurve*>(*prevOne),
static_cast<Subcurve*>(*slIter));
if (slIter != this->m_statusLine.end())
_intersect(static_cast<Subcurve*>(*prevOne),
static_cast<Subcurve*>(*slIter));
}
//-----------------------------------------------------------------------------
@ -287,32 +269,23 @@ bool Sweep_line_2<Tr, Vis, Subcv, Evnt, Alloc>::_add_curve_to_right
{
Event_subcurve_iterator iter;
for (iter = event->right_curves_begin();
iter != event->right_curves_end();
for (iter = event->right_curves_begin(); iter != event->right_curves_end();
++iter)
{
if ((curve == *iter) || (*iter)->is_inner_node(curve))
{
return false;
}
if((curve)->is_inner_node(*iter))
{
if ((curve)->is_inner_node(*iter)) {
*iter = curve;
return false;
}
if((curve)->has_common_leaf(*iter))
{
if ((curve)->has_common_leaf(*iter)) {
std::list<Base_subcurve*> list_of_sc;
curve->distinct_nodes(*iter, std::back_inserter(list_of_sc));
typename std::list<Base_subcurve*>::iterator sc_iter;
for(sc_iter = list_of_sc.begin();
sc_iter != list_of_sc.end();
++sc_iter)
{
for (sc_iter = list_of_sc.begin(); sc_iter != list_of_sc.end(); ++sc_iter)
_add_curve_to_right(event, static_cast<Subcurve*>(*sc_iter));
}
return true;
}
}
@ -321,12 +294,12 @@ bool Sweep_line_2<Tr, Vis, Subcv, Evnt, Alloc>::_add_curve_to_right
if (! pair_res.first)
// No overlap occurs:
return (false);
return false;
_handle_overlap(event, curve, pair_res.second, overlap_exist);
// Inidicate that an overlap has occured:
return (true);
return true;
}
//-----------------------------------------------------------------------------
@ -334,9 +307,7 @@ bool Sweep_line_2<Tr, Vis, Subcv, Evnt, Alloc>::_add_curve_to_right
//
template <class Tr, class Vis, class Subcv, class Evnt, typename Alloc>
void Sweep_line_2<Tr, Vis, Subcv, Evnt, Alloc>::
_remove_curve_from_status_line (Subcurve *leftCurve,
bool remove_for_good)
_remove_curve_from_status_line(Subcurve* leftCurve, bool remove_for_good)
{
CGAL_PRINT("remove_curve_from_status_line\n";);
CGAL_SL_DEBUG(this->PrintStatusLine(););
@ -346,8 +317,7 @@ _remove_curve_from_status_line (Subcurve *leftCurve,
this->m_status_line_insert_hint = sliter;
++(this->m_status_line_insert_hint);
if(! remove_for_good)
{
if (! remove_for_good) {
// the subcurve is not removed for good, so we dont need to intersect
// his neighbours after its removal.
this->m_statusLine.erase(sliter);
@ -363,8 +333,7 @@ _remove_curve_from_status_line (Subcurve *leftCurve,
Status_line_iterator lastOne = this->m_statusLine.end();
--lastOne;
if (sliter != this->m_statusLine.begin() && sliter != lastOne)
{
if (sliter != this->m_statusLine.begin() && sliter != lastOne) {
Status_line_iterator prev = sliter; --prev;
Status_line_iterator next = sliter; ++next;
@ -380,8 +349,8 @@ _remove_curve_from_status_line (Subcurve *leftCurve,
// Compute intersections between the two given curves.
//
template <class Tr, class Vis, class Subcv, class Evnt, typename Alloc>
void Sweep_line_2<Tr, Vis, Subcv, Evnt, Alloc>::
_intersect (Subcurve *c1, Subcurve *c2)
void Sweep_line_2<Tr, Vis, Subcv, Evnt, Alloc>::_intersect(Subcurve* c1,
Subcurve* c2)
{
typedef typename Tr::Multiplicity Multiplicity;
@ -395,23 +364,21 @@ _intersect (Subcurve *c1, Subcurve *c2)
// look up for (c1,c2) in the table and insert if doesnt exist
Curve_pair cv_pair(c1,c2);
if(! (m_curves_pair_set.insert(cv_pair)).second )
if (! (m_curves_pair_set.insert(cv_pair)).second )
return; //the curves have already been checked for intersection
float load_factor = static_cast<float>(m_curves_pair_set.size()) /
m_curves_pair_set.bucket_count();
m_curves_pair_set.bucket_count();
// after lot of benchemarks, keeping load_factor<=6 is optimal
if(load_factor > 6.0f)
if (load_factor > 6.0f)
m_curves_pair_set.resize(m_curves_pair_set.size() * 6);
vector_inserter vi (m_x_objects) ;
vector_inserter vi_end (m_x_objects);
vi_end = this->m_traits->intersect_2_object()(c1->last_curve(),
c2->last_curve(),
vi);
vector_inserter vi(m_x_objects) ;
vector_inserter vi_end(m_x_objects);
vi_end =
this->m_traits->intersect_2_object()(c1->last_curve(), c2->last_curve(), vi);
if (vi == vi_end)
{
if (vi == vi_end) {
CGAL_PRINT("no intersection...\n";);
return; // no intersection at all
}
@ -432,8 +399,8 @@ _intersect (Subcurve *c1, Subcurve *c2)
this->m_traits->parameter_space_in_y_2_object()(c2->last_curve(),
ARR_MIN_END);
if (ps_x1 != CGAL::ARR_INTERIOR && ps_y1 != CGAL::ARR_INTERIOR &&
(ps_x1 == ps_x2) && (ps_y1 == ps_y2) &&
if ((ps_x1 == ps_x2) && (ps_y1 == ps_y2) &&
((ps_x1 != ARR_INTERIOR) || (ps_y1 != ARR_INTERIOR)) &&
this->m_traits->is_closed_2_object()(c1->last_curve(), ARR_MIN_END) &&
this->m_traits->is_closed_2_object()(c2->last_curve(), ARR_MIN_END))
{
@ -453,17 +420,15 @@ _intersect (Subcurve *c1, Subcurve *c2)
if (reinterpret_cast<Event*>(c1->right_event()) ==
reinterpret_cast<Event*>(c2->right_event()))
{
vector_inserter vi_last = vi_end;
vector_inserter vi_last = vi_end;
--vi_last;
if (object_cast<std::pair<Point_2,Multiplicity> > (&(*vi_last)) != NULL)
{
if (object_cast<std::pair<Point_2, Multiplicity> >(&(*vi_last)) != NULL) {
CGAL_PRINT(" [Skipping common right endpoint...]\n";);
--vi_end;
}
}
else
{
else {
// In case both right curve-ends have boundary conditions and are not
// open, check whether the right endpoints are the same. If they are,
// skip the last intersection point.
@ -486,13 +451,13 @@ _intersect (Subcurve *c1, Subcurve *c2)
this->m_traits->is_closed_2_object()(c2->last_curve(), ARR_MAX_END))
{
if (this->m_traits->equal_2_object()
(this->m_traits->construct_max_vertex_2_object() (c1->last_curve()),
this->m_traits->construct_max_vertex_2_object() (c2->last_curve())))
(this->m_traits->construct_max_vertex_2_object()(c1->last_curve()),
this->m_traits->construct_max_vertex_2_object()(c2->last_curve())))
{
vector_inserter vi_last = vi_end;
vector_inserter vi_last = vi_end;
--vi_last;
if (object_cast<std::pair<Point_2,Multiplicity> > (&(*vi_last)) != NULL)
if (object_cast<std::pair<Point_2, Multiplicity> >(&(*vi_last)) != NULL)
{
CGAL_PRINT(" [Skipping common right endpoint on boundary...]\n";);
--vi_end;
@ -501,17 +466,15 @@ _intersect (Subcurve *c1, Subcurve *c2)
}
}
const std::pair<Point_2,Multiplicity> *xp_point;
const std::pair<Point_2,Multiplicity>* xp_point;
// Efi: why not skipping in a loop?check only one (that is, why not in a loop)?
if(vi != vi_end)
{
xp_point = object_cast<std::pair<Point_2,Multiplicity> > (&(*vi));
if (xp_point != NULL)
{
if (vi != vi_end) {
xp_point = object_cast<std::pair<Point_2, Multiplicity> >(&(*vi));
if (xp_point != NULL) {
// Skip the intersection point if it is not larger than the current
// event.
if (this->m_queueEventLess (xp_point->first, this->m_currentEvent) !=
if (this->m_queueEventLess(xp_point->first, this->m_currentEvent) !=
LARGER)
{
++vi;
@ -519,24 +482,21 @@ _intersect (Subcurve *c1, Subcurve *c2)
}
}
for( ; vi != vi_end ; ++vi)
{
const X_monotone_curve_2 *icv;
for ( ; vi != vi_end ; ++vi) {
const X_monotone_curve_2* icv;
Point_2 xp;
unsigned int multiplicity = 0;
xp_point = object_cast<std::pair<Point_2,Multiplicity> > (&(*vi));
if (xp_point != NULL)
{
xp_point = object_cast<std::pair<Point_2,Multiplicity> >(&(*vi));
if (xp_point != NULL) {
xp = xp_point->first;
multiplicity = xp_point->second;
CGAL_PRINT("found an intersection point: " << xp << "\n";);
_create_intersection_point(xp, multiplicity, c1, c2);
}
else
{
icv = object_cast<X_monotone_curve_2> (&(*vi));
CGAL_assertion (icv != NULL);
else {
icv = object_cast<X_monotone_curve_2>(&(*vi));
CGAL_assertion(icv != NULL);
CGAL_PRINT("found an overlap: " << *icv << "\n";);
// TODO EBEB: This code does not work with overlaps that reach the boundary
@ -555,19 +515,17 @@ _intersect (Subcurve *c1, Subcurve *c2)
//
template <class Tr, class Vis, class Subcv, class Evnt, typename Alloc>
void Sweep_line_2<Tr, Vis, Subcv, Evnt, Alloc>::
_create_intersection_point (const Point_2& xp,
unsigned int multiplicity,
Subcurve* &c1, Subcurve* &c2,
bool is_overlap)
_create_intersection_point(const Point_2& xp,
unsigned int multiplicity,
Subcurve*& c1, Subcurve*& c2,
bool is_overlap)
{
// insert the event and check if an event at this point already exists.
const std::pair<Event*, bool>& pair_res =
this->_push_event (xp, Base_event::DEFAULT,
ARR_INTERIOR, ARR_INTERIOR);
this->_push_event(xp, Base_event::DEFAULT, ARR_INTERIOR, ARR_INTERIOR);
Event *e = pair_res.first;
if(pair_res.second)
{
Event* e = pair_res.first;
if (pair_res.second) {
CGAL_PRINT("A new event is created .. (" << xp <<")\n";);
// a new event is creatd , which inidicates
// that the intersection point cannot be one
@ -580,40 +538,34 @@ _create_intersection_point (const Point_2& xp,
e->push_back_curve_to_left(c2);
// Act according to the multiplicity:
if (multiplicity == 0)
{
if (multiplicity == 0) {
// The multiplicity of the intersection point is unkown or undefined:
_add_curve_to_right(e, c1, is_overlap);
_add_curve_to_right(e, c2, is_overlap);
if(! is_overlap)
{
if(e->is_right_curve_bigger(c1, c2))
if (! is_overlap) {
if (e->is_right_curve_bigger(c1, c2))
std::swap(c1, c2);
}
}
else
{
if((multiplicity % 2) == 1)
{
else {
if ((multiplicity % 2) == 1) {
// The mutiplicity of the intersection point is odd: Swap their
// order to the right of this point.
std::swap(c1,c2);
e->add_curve_pair_to_right (c1, c2);
e->add_curve_pair_to_right(c1, c2);
}
else
{
else {
// The mutiplicity of the intersection point is even, so they
// maintain their order to the right of this point.
CGAL_assertion((multiplicity % 2) == 0);
e->add_curve_pair_to_right (c1, c2);
e->add_curve_pair_to_right(c1, c2);
}
}
}
else // the event already exists, so we need to update it accordingly
{
CGAL_PRINT("Event already exists, updating.. (" << xp <<")\n";);
if (e == this->m_currentEvent)
{
if (e == this->m_currentEvent) {
// This can happen when c1 starts at the interior of c2 (or vice versa).
return;
}
@ -621,48 +573,40 @@ _create_intersection_point (const Point_2& xp,
e->add_curve_to_left(c1);
e->add_curve_to_left(c2);
if ( !c1->is_end_point(e) && !c2->is_end_point(e))
{
if (!c1->is_end_point(e) && !c2->is_end_point(e)) {
_add_curve_to_right(e, c1, is_overlap);
_add_curve_to_right(e, c2, is_overlap);
e->set_intersection();
this->m_visitor ->update_event(e, c1, c2, false);
}
else
{
if(!c1->is_end_point(e) && c2->is_end_point(e))
{
else {
if (!c1->is_end_point(e) && c2->is_end_point(e)) {
_add_curve_to_right(e, c1, is_overlap);
e->set_weak_intersection();
this->m_visitor ->update_event(e, c1);
}
else
{
if(c1->is_end_point(e) && !c2->is_end_point(e))
{
else {
if (c1->is_end_point(e) && !c2->is_end_point(e)) {
_add_curve_to_right(e, c2, is_overlap);
e->set_weak_intersection();
this->m_visitor ->update_event(e, c2);
}
}
}
if (! is_overlap)
{
if(e->is_right_curve_bigger(c1, c2))
if (! is_overlap) {
if (e->is_right_curve_bigger(c1, c2))
std::swap(c1, c2);
}
}
CGAL_SL_DEBUG(e->Print();)
}
//-----------------------------------------------------------------------------
// Fix overlap Subcurves before handling the current event.
//
template <class Tr, class Vis, class Subcv, class Evnt, typename Alloc>
void Sweep_line_2<Tr, Vis, Subcv, Evnt, Alloc>::_fix_overlap_subcurves ()
void Sweep_line_2<Tr, Vis, Subcv, Evnt, Alloc>::_fix_overlap_subcurves()
{
CGAL_assertion(this->m_currentEvent->has_left_curves());
@ -670,16 +614,13 @@ void Sweep_line_2<Tr, Vis, Subcv, Evnt, Alloc>::_fix_overlap_subcurves ()
this->m_currentEvent->left_curves_begin();
//special treatment for Subcuves that store overlaps
while ( leftCurveIter != this->m_currentEvent->left_curves_end() )
{
Subcurve *leftCurve = *leftCurveIter;
while (leftCurveIter != this->m_currentEvent->left_curves_end()) {
Subcurve* leftCurve = *leftCurveIter;
// we check if the subcurve store overlap and current event is its
// right end point.
if((Event*)leftCurve->right_event() == this->m_currentEvent)
{
if(leftCurve->originating_subcurve1() != NULL)
{
if ((Event*)leftCurve->right_event() == this->m_currentEvent) {
if (leftCurve->originating_subcurve1() != NULL) {
Subcurve* orig_sc_1 = (Subcurve*)leftCurve->originating_subcurve1();
Subcurve* orig_sc_2 = (Subcurve*)leftCurve->originating_subcurve2();
@ -701,20 +642,19 @@ void Sweep_line_2<Tr, Vis, Subcv, Evnt, Alloc>::_fix_overlap_subcurves ()
// overlap_exist - a flag indicates if the overlap X_monotone_curve_2 was
// computed already (is true than its stored at sub_cv1 data member).
template <class Tr, class Vis, class Subcv, class Evnt, typename Alloc>
void Sweep_line_2<Tr, Vis, Subcv, Evnt, Alloc>::_handle_overlap
(Event* event,
Subcurve* curve,
Event_subcurve_iterator iter,
bool overlap_exist)
void Sweep_line_2<Tr, Vis, Subcv, Evnt, Alloc>::
_handle_overlap(Event* event,
Subcurve* curve,
Event_subcurve_iterator iter,
bool overlap_exist)
{
// An overlap occurs:
CGAL_PRINT("Overlap detected at right insertion...\n";);
X_monotone_curve_2 overlap_cv;
if(overlap_exist)
if (overlap_exist)
overlap_cv = sub_cv1;
else
{
else {
// compute the overlap.
std::vector<Object> obj_vec;
vector_inserter vit(obj_vec);
@ -722,13 +662,12 @@ void Sweep_line_2<Tr, Vis, Subcv, Evnt, Alloc>::_handle_overlap
(*iter)->last_curve(),
vit);
if(obj_vec.empty())
if (obj_vec.empty())
return;
overlap_cv = object_cast<X_monotone_curve_2> (obj_vec.front());
overlap_cv = object_cast<X_monotone_curve_2>(obj_vec.front());
}
// Get the right end of overlap_cv (if it is closed from the right).
Event *right_end;
Arr_parameter_space ps_x_r =
@ -736,9 +675,8 @@ void Sweep_line_2<Tr, Vis, Subcv, Evnt, Alloc>::_handle_overlap
Arr_parameter_space ps_y_r =
this->m_traits->parameter_space_in_y_2_object()(overlap_cv, ARR_MAX_END);
CGAL_assertion (ps_x_r != ARR_LEFT_BOUNDARY);
if (ps_x_r != ARR_INTERIOR || ps_y_r != ARR_INTERIOR)
{
CGAL_assertion(ps_x_r != ARR_LEFT_BOUNDARY);
if ((ps_x_r != ARR_INTERIOR) || (ps_y_r != ARR_INTERIOR)) {
// The overlapping subcurve is either open from the right, or
// touches the boundary of the surface. In either case, the curves that
// are involved in the overlap must also be open or defined at the
@ -747,15 +685,14 @@ void Sweep_line_2<Tr, Vis, Subcv, Evnt, Alloc>::_handle_overlap
CGAL_assertion((*iter)->right_event() == curve->right_event());
right_end = (Event*)(curve->right_event());
}
else
{
else {
// The overlapping subcurve has a valid right endpoint.
// Find the event associated with this point (or create a new event).
Point_2 end_overlap =
this->m_traits->construct_max_vertex_2_object()(overlap_cv);
const std::pair<Event*, bool>& pair_res =
this->_push_event (end_overlap, Base_event::OVERLAP, ps_x_r, ps_y_r);
this->_push_event(end_overlap, Base_event::OVERLAP, ps_x_r, ps_y_r);
right_end = pair_res.first;
}
@ -766,48 +703,44 @@ void Sweep_line_2<Tr, Vis, Subcv, Evnt, Alloc>::_handle_overlap
Arr_parameter_space ps_y_l =
this->m_traits->parameter_space_in_y_2_object()(overlap_cv, ARR_MIN_END);
CGAL_assertion (ps_x_l != ARR_RIGHT_BOUNDARY);
if (ps_x_l == ARR_INTERIOR && ps_y_l == ARR_INTERIOR)
{
CGAL_assertion(ps_x_l != ARR_RIGHT_BOUNDARY);
if ((ps_x_l == ARR_INTERIOR) && (ps_y_l == ARR_INTERIOR)) {
// The left end of the overlapping subcurve is regular point, so in case
// the event is also associated with a regular point (not incident to the
// surface boundaries), we make sure that the overlapping subcurve does
// not start to the left of this event.
if (! event->is_on_boundary())
{
if (! event->is_on_boundary()) {
// If the left endpoint of the overlapping curve is to the left of the
// event, split the overlapping subcurve so its left endpoint equals
// the event point.
const Point_2& begin_overlap =
const Point_2& begin_overlap =
this->m_traits->construct_min_vertex_2_object()(overlap_cv);
Comparison_result res =
this->m_traits->compare_xy_2_object() (event->point(), begin_overlap);
this->m_traits->compare_xy_2_object()(event->point(), begin_overlap);
CGAL_assertion (res != SMALLER);
if (res == LARGER)
{
this->m_traits->split_2_object() (overlap_cv, event->point(),
sub_cv1, sub_cv2);
CGAL_assertion(res != SMALLER);
if (res == LARGER) {
this->m_traits->split_2_object()(overlap_cv, event->point(),
sub_cv1, sub_cv2);
overlap_cv = sub_cv2;
}
}
}
else
{
else {
// The left end of the overlapping subcurve is either open, or
// incident to the surface boundaries. In case the current event is
// associated with a regular point, it must lie to the right of this
// curve-end, so we clip the overlapping subcurve accordingly.
if (! event->is_on_boundary())
{
this->m_traits->split_2_object() (overlap_cv, event->point(),
sub_cv1, sub_cv2);
this->m_traits->split_2_object()(overlap_cv, event->point(),
sub_cv1, sub_cv2);
overlap_cv = sub_cv2;
}
}
// Alocate a new Subcure for the overlap
Subcurve *overlap_sc = this->m_subCurveAlloc.allocate(1);
Subcurve* overlap_sc = this->m_subCurveAlloc.allocate(1);
this->m_subCurveAlloc.construct(overlap_sc, this->m_masterSubcurve);
overlap_sc->init(overlap_cv);
overlap_sc->set_left_event(event);
@ -833,15 +766,11 @@ void Sweep_line_2<Tr, Vis, Subcv, Evnt, Alloc>::_handle_overlap
// If one of the originating subcurves (or both), does not end
// at the right end of the overlap, add them to the right subcurves
// of the event associated with the right end of the overlap.
if((Event*)curve->right_event() != right_end)
{
if ((Event*)curve->right_event() != right_end)
_add_curve_to_right(right_end, curve);
}
if((Event*)(*iter)->right_event() != right_end)
{
if ((Event*)(*iter)->right_event() != right_end)
_add_curve_to_right(right_end, (*iter));
}
this->m_visitor->found_overlap(curve, *iter, overlap_sc);
@ -856,17 +785,16 @@ void Sweep_line_2<Tr, Vis, Subcv, Evnt, Alloc>::_handle_overlap
// an overlap can be itself a subcurve that stores overlap and so on.
template <class Tr, class Vis, class Subcv, class Evnt, typename Alloc>
void Sweep_line_2<Tr, Vis, Subcv, Evnt, Alloc>::
_fix_finished_overlap_subcurve (Subcurve* sc)
_fix_finished_overlap_subcurve(Subcurve* sc)
{
//
CGAL_assertion(sc != NULL);
// split 'sc' if necessary and update to event as weak intersection
if((Event*)sc->right_event() != this->m_currentEvent)
{
this->m_traits->split_2_object() (sc->last_curve(),
this->m_currentEvent->point(),
sub_cv1, sub_cv2);
if ((Event*)sc->right_event() != this->m_currentEvent) {
this->m_traits->split_2_object()(sc->last_curve(),
this->m_currentEvent->point(),
sub_cv1, sub_cv2);
sc->set_last_curve(sub_cv2);
this->m_currentEvent->set_weak_intersection();
@ -874,7 +802,7 @@ _fix_finished_overlap_subcurve (Subcurve* sc)
return;
}
if(!sc->originating_subcurve1())
if (!sc->originating_subcurve1())
// sc does not store an overlap, we are done
return;

View File

@ -21,6 +21,8 @@
#define S_D 2.5f
#include <CGAL/config.h> // to include before NDEBUG is defined, to
// workaround the check in the testsuite
#ifndef NDEBUG
#define NDEBUG //points are not on circular arcs
#endif

View File

@ -78,10 +78,6 @@ if(OPENGL_FOUND)
target_link_libraries( CGAL_ImageIO ${CGAL_LIBRARY} ${CGAL_3RD_PARTY_LIBRARIES} ${CGAL_ImageIO_3RD_PARTY_LIBRARIES} )
if ( CGAL_INSTALL_LIB_DIR )
install(TARGETS CGAL_ImageIO DESTINATION ${CGAL_INSTALL_LIB_DIR} )
endif()
else(OPENGL_FOUND)
message( STATUS "CGAL_ImageIO needs OpenGL, cannot be configured.")
endif(OPENGL_FOUND)

View File

@ -1,7 +1,12 @@
# Top level CMakeLists.txt for CGAL-branchbuild
project(CGAL CXX)
cmake_minimum_required(VERSION 2.6.2)
# Minimal version of CMake:
if(WIN32)
cmake_minimum_required(VERSION 2.6.2)
else(WIN32)
cmake_minimum_required(VERSION 2.8.6)
endif()
# option for branch build

View File

@ -27,10 +27,3 @@ add_dependencies( CGAL_Core CGAL )
add_definitions ( ${CGAL_3RD_PARTY_DEFINITIONS} )
target_link_libraries( CGAL_Core ${CGAL_LIBRARY} ${CGAL_3RD_PARTY_LIBRARIES} )
set( CGAL_Core_BASENAME CGAL_Core )
if ( CGAL_INSTALL_LIB_DIR )
install(TARGETS CGAL_Core DESTINATION ${CGAL_INSTALL_LIB_DIR} )
endif()

View File

@ -66,8 +66,6 @@ if( QT4_FOUND )
endforeach()
endforeach()
set( CGAL_Qt4_BASENAME CGAL_Qt4 )
foreach(mocfile ${mocfiles})
list(APPEND additional_files ${mocfile})
endforeach()
@ -91,10 +89,6 @@ if( QT4_FOUND )
add_definitions( -DCGAL_FAKE_PUBLIC_RELEASE )
endif()
if ( CGAL_INSTALL_LIB_DIR )
install(TARGETS CGAL_Qt4 DESTINATION ${CGAL_INSTALL_LIB_DIR} )
endif()
else()
message( STATUS "CGAL_Qt4 needs OpenGL, cannot be configured.")
endif()

View File

@ -1,8 +1,194 @@
Release notes of CGAL.
****** Release History ******
===============================================================================
4.0  (XXX 2012)
3.9  (September 2011)
3.8  (April 2011)
3.7  (October 2010)
3.6.1  (June 2010)
3.6  (March 2010)
3.5.1  (December 2009)
3.5  (October 2009)
3.4  (January 2009)
3.3.1 (August 2007)
3.3 (May 2007)
Number of lines of
3.2.1 (July 2006) code of CGAL
(restricted to the
3.2 (May 2006) include/CGAL/
directory).
3.1 (December 2004) [Releases size graph]
3.0.1 (February 2004)
3.0 (October 2003)
2.4 (May 2002)
2.3 (August 2001)
2.2 (October 2000)
2.1 (January 2000)
2.0 (June 1999)
1.2 (January 1999)
1.1 (July 1998)
1.0 (April 1998)
0.9 (June 1997)
===============================================================================
-------------------------------- Release 4.0 --------------------------------
Release date: XXX 2012
CGAL 4.0 offers the following improvements and new functionality :
* License changes
The whole CGAL-3.x series was released under a combination of LGPLv2 (for the
foundations of CGAL), and QPL (for the high-level packages). QPL was the former
license of the graphical toolkit Qt, but that license is no supported by any
major free software project. Furthemore, the terms of the LGPLv2 license are
umbiguous for a library of C++ templates, like CGAL.
The CGAL project, driven by the CGAL Editorial Board, has decided to change the
license scheme of CGAL. The major number of the CGAL version has been bumped to
4 for that reason. The CGAL-4.x series will be released under:
- LGPLv3+ (that is LGPL "either version 3 of the License, or (at your option)
any later version"), for the foundations of CGAL, instead of LGPLv2,
- GPLv3+ for the high-level packages, instead of QPL.
* General
- On Windows, CGAL libraries are now built by default as shared libraries
(also called DLL). To run applications that use .dll files of CGAL, you
must either copy the .dll files into the directory of the application, or
add the path of the directory that contains those .dll filesinto the PATH
environment variable.
- On Windows, the CMake scripts of CGAL now search for shared version of the
Boost libraries. You must ensure that the .dll files of Boost are found by
the dynamic linker. You can, for example, add the path to the Boost .dll
files to the PATH environment variable.
- On Windows, CMake version 2.8.6 or higher is now required.
- Eigen version 3.1 or later is now the recommanded third party library to
use in Planar Parameterization of Triangulated Surface Meshes, Surface
Reconstruction from Point Sets, Approximation of Ridges and Umbilics on
Triangulated Surface Meshes, and Estimation of Local Differential
Properties of Point-Sampled Surfaces packages. If you use Eigen you no
longer need Taucs, Lapack or Blas to use those packages (and any other in
CGAL).
* AABB tree
- Document constness of member functions of the AABB_tree class.
- The class AABB_tree is now guaranteed to be read-only thread-safe. As usual
in CGAL, this small overhead introduced for thread-safety can be
deactivated by defining CGAL_HAS_NO_THREADS.
* 2D Alpha shapes
- Add an extra template parameter to the class Alpha_shape_2 that allows a
certified construction using a traits class with exact predicates and
inexact constructions.
- An object of type Alpha_shape_2 can now be constructed from a
triangulation.
* 3D Alpha shapes
- Add an extra template parameter to the class Alpha_shape_3 that allows a
certified construction using a traits class with exact predicates and
inexact constructions.
* Geometric Object Generators
- Random_points_in_iso_box_d (deprecated since 3.8) has been removed. Use
Random_points_in_cube_d instead.
* Linear_cell_complex (new package)
- This package implements linear cell complexes, objects in d-dimension with
linear geometry. The combinatorial part of objects is described by a
combinatorial map, representing all the cells of the object plus the
incidence and adjacency relations between cells. Geometry is added on
combinatorial maps simply by associating a Point to each vertex of the map.
This data structure can be seen as the generalization in dD of the
Polyhedron_3.
* Spatial Searching
- The const-correctness of this package have been worked out. The transition
for users should be smooth in general, however adding few const in user
code might be needed in some cases.
- The class Kd_tree is now guaranteed to be read-only thread-safe. As usual
in CGAL, this small overhead introduced for thread-safety can be
deactivated by defining CGAL_HAS_NO_THREADS.
- Bug-fix in Orthogonal_incremental_neighbor_search and
Incremental_neighbor_search classes. Several calls to begin() now allow to
make several nearest neighbor search queries independently.
* STL extension
- CGAL::copy_n is now deprecated for CGAL::cpp0x::copy_n which uses std::
copy_n, if available on the platform.
- CGAL::successor and CGAL::predecessor are now deprecated for CGAL::cpp0x::
next and CGAL::cpp0x::prev. These functions use the standard versions if
available on the platform. Otherwise, boost::next and boost::prior are
used.
* Triangulation_2
- Fix a thread-safety issue in Delaunay_triangulation_2 remove functions. As
usual in CGAL, the small overhead introduced for thread-safety can be
deactivated by defining CGAL_HAS_NO_THREADS.
- Add extraction operator for the class Constrained_triangulation_2 (and thus
to all inheriting classes).
-------------------------------- Release 3.9 --------------------------------
Release date: Sep 2011
Release date: September 2011
CGAL 3.9 offers the following improvements and new functionality :
@ -28,7 +214,7 @@ CGAL 3.9 offers the following improvements and new functionality :
describes all cells of the subdivision and all the incidence and adjacency
relations between these cells. For example it allows to describe a 3D
object subdivided in vertices, edges, faces and volumes. This data
structure can be seen as the generalization in dD of the haldedge data
structure can be seen as the generalization in dD of the halfedge data
structure.
@ -86,7 +272,7 @@ CGAL 3.9 offers the following improvements and new functionality :
which were not available at the time the old traits class was developed.
- A new geometry traits concept called ArrangementOpenBoundaryTraits_2 has
been introduced. A model of this concept suports curves that approach the
been introduced. A model of this concept supports curves that approach the
open boundary of an iso-rectangular area called parameter space, which can
be unbounded or bounded. The general code of the package, however, supports
only the unbounded parameter space. We intend to enhance the general code

View File

@ -3,10 +3,14 @@
# refer to the root source directory of the project as ${CMAKE_SOURCE_DIR} or
# ${CMAKE_SOURCE_DIR} and to the root binary directory of the project as
# ${CMAKE_BINARY_DIR} or ${CMAKE_BINARY_DIR}.
project(CGAL)
project(CGAL CXX)
# Minimal version of CMake:
cmake_minimum_required(VERSION 2.6.2)
if(WIN32)
cmake_minimum_required(VERSION 2.6.2)
else(WIN32)
cmake_minimum_required(VERSION 2.8.6)
endif()
# Tested version:
if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6)
@ -117,6 +121,7 @@ if ( CGAL_BRANCH_BUILD )
# TODO set number of internal release (replace "000")
set(CGAL_CREATED_VERSION "${CGAL_CREATED_VERSION_NUM}-I-${CGAL_BUILD_VERSION}")
set(CGAL_VERSION "${CGAL_CREATED_VERSION_NUM}-I-${CGAL_BUILD_VERSION}")
file(WRITE "${CMAKE_BINARY_DIR}/VERSION" "${CGAL_CREATED_VERSION_NUM}")

View File

@ -32,6 +32,7 @@ CGAL packages, some are only needed for demos.
* CMake (>= 2.6.2), the build system used by CGAL
Required for building CGAL
On Windows, CMake >= 2.8.6 is required.
* Boost (>= 1.39)
Required for building CGAL and for applications using CGAL

View File

@ -138,6 +138,8 @@ CGAL 4.0 offers the following improvements and new functionality : </p>
found by the dynamic linker. You can, for example, add the path to
the Boost .dll files to the PATH environment variable.
</li>
<li>On Windows, CMake version 2.8.6 or higher is now required.
</li>
<li>Eigen version 3.1 or later is now the recommanded third party library to use
in <i>Planar Parameterization of Triangulated Surface Meshes</i>,
<i>Surface Reconstruction from Point Sets</i>,
@ -235,7 +237,7 @@ CGAL 3.9 offers the following improvements and new functionality : </p>
<li>This package provides a new combinatorial data structure allowing to describe any orientable subdivided object whatever its dimension.
It describes all cells of the subdivision and all the incidence and adjacency relations between these cells.
For example it allows to describe a 3D object subdivided in vertices, edges, faces and volumes.
This data structure can be seen as the generalization in dD of the haldedge data structure.</li>
This data structure can be seen as the generalization in dD of the halfedge data structure.</li>
</ul>
<h3>3D Convex Hull (major performance improvement)</h3>
@ -285,7 +287,7 @@ CGAL 3.9 offers the following improvements and new functionality : </p>
the time the old traits class was developed.</li>
<li>A new geometry traits concept called
<code>ArrangementOpenBoundaryTraits_2</code> has been introduced.
A model of this concept suports curves that approach the open
A model of this concept supports curves that approach the open
boundary of an iso-rectangular area called parameter space, which can
be unbounded or bounded. The general code of the package, however,
supports only the unbounded parameter space. We intend to enhance the

View File

@ -96,7 +96,9 @@ In order to build the \cgal\ libraries, you need a \CC\ compiler.
In order to configure, build, and install the \cgal\ libraries, examples and
demos, you need \cmake, a cross-platform ``makefile generator''.
If \cmake\ is not installed already you can obtain it from \cmakepage.
\cmake\ version~2.6.2 or higher is required.
\cmake\ version~2.6.2 or higher is required. On Windows, \cmake{}
version~2.8.6 or higher is required, for a proper support of DLLs
generation.

View File

@ -38,6 +38,14 @@
# error The test-suite needs no NDEBUG defined
#endif // CGAL_TEST_SUITE and NDEBUG
// Workaround to the following bug:
// https://bugreports.qt.nokia.com/browse/QTBUG-22829
#ifdef Q_MOC_RUN
// When Qt moc runs on CGAL files, do not process
// <boost/type_traits/has_operator.hpp>
# define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED
#endif
// The following header file defines among other things BOOST_PREVENT_MACRO_SUBSTITUTION
#include <boost/config.hpp>

View File

@ -8,9 +8,3 @@ build_cgal_library(CGAL CGAL "")
target_link_libraries(CGAL ${CGAL_3RD_PARTY_LIBRARIES})
set( CGAL_BASENAME CGAL )
if ( CGAL_INSTALL_LIB_DIR )
install(TARGETS CGAL DESTINATION ${CGAL_INSTALL_LIB_DIR} )
endif()

View File

@ -69,6 +69,11 @@ function (build_cgal_library LIBRARY_NAME LIBRARY_DIR_NAME ADDITIONAL_FILES)
add_custom_command(TARGET ${LIBRARY_NAME} POST_BUILD COMMAND if exist \"$(SolutionDir)lib\\$(ConfigurationName)\\$(TargetName).lib\" copy /Y \"$(SolutionDir)lib\\$(ConfigurationName)\\$(TargetName).lib\" \"$(SolutionDir)lib\" )
endif()
endif(NOT CGAL_AUTO_LINK_ENABLED)
install(TARGETS ${LIBRARY_NAME}
RUNTIME DESTINATION ${CGAL_INSTALL_BIN_DIR}
LIBRARY DESTINATION ${CGAL_INSTALL_LIB_DIR}
ARCHIVE DESTINATION ${CGAL_INSTALL_LIB_DIR})
endfunction()
function( configure_component DIR COMPONENT )

View File

@ -1,4 +1,8 @@
#include <CGAL/config.h>
#define NDEBUG
// NDEBUG is defined after <CGAL/config.h> is included, to workaround the
// check of the testsuite that NDEBUG is not defined.
//#define CGAL_CHECK_EXPENSIVE
//#define CGAL_CHECK_EXACTNESS

View File

@ -6,8 +6,8 @@
in \emph{d}-dimension with linear geometry. The combinatorial part
of objects is described by a combinatorial map, representing all
the cells of the object plus the incidence and adjacency relations
between cells. Geometry is added on combinatorial maps simply by
associating a \emph{Point} to each vertex of the map.
between cells. Geometry is added to combinatorial maps simply by
associating a point to each vertex of the map.
Taking a 2D combinatorial map, and using 3D points, gives a
linear cell complex equivalent to a \emph{Polyhedron\_3}.}

View File

@ -18,22 +18,22 @@
BUILD_SHARED_LIBS:BOOL=OFF
//Path to a file.
Boost_INCLUDE_DIR:PATH=C:/CGAL/boost_1_46_0
Boost_INCLUDE_DIR:PATH=C:/CGAL/boost-release-branch
//Boost library directory
Boost_LIBRARY_DIRS:FILEPATH=C:/CGAL/boost_1_46_0/stage/lib;C:/CGAL/boost_1_46_0/stage/lib
Boost_LIBRARY_DIRS:FILEPATH=C:/CGAL/boost-release-branch/stage/lib;C:/CGAL/boost-release-branch/stage/lib
//Boost diagnostic define
Boost_LIB_DIAGNOSTIC_DEFINITIONS:STRING=-DBOOST_LIB_DIAGNOSTIC
//The Boost THREAD library
Boost_THREAD_LIBRARY:FILEPATH=optimized;C:/CGAL/boost_1_46_0/stage/lib/libboost_thread-vc90-mt-1_46.lib;debug;C:/CGAL/boost_1_46_0/stage/lib/libboost_thread-vc90-mt-gd-1_46.lib
Boost_THREAD_LIBRARY:FILEPATH=optimized;C:/CGAL/boost-release-branch/stage/lib/libboost_thread-vc90-mt-1_49.lib;debug;C:/CGAL/boost-release-branch/stage/lib/libboost_thread-vc90-mt-gd-1_49.lib
//Path to a library.
Boost_THREAD_LIBRARY_DEBUG:FILEPATH=C:/CGAL/boost_1_46_0/stage/lib/libboost_thread-vc90-mt-gd-1_46.lib
Boost_THREAD_LIBRARY_DEBUG:FILEPATH=C:/CGAL/boost-release-branch/stage/lib/libboost_thread-vc90-mt-gd-1_49.lib
//Path to a library.
Boost_THREAD_LIBRARY_RELEASE:FILEPATH=C:/CGAL/boost_1_46_0/stage/lib/libboost_thread-vc90-mt-1_46.lib
Boost_THREAD_LIBRARY_RELEASE:FILEPATH=C:/CGAL/boost-release-branch/stage/lib/libboost_thread-vc90-mt-1_49.lib
//Enable/Disable auto-linking for the external library GMP
CGAL_AUTO_LINK_GMP:BOOL=OFF
@ -48,7 +48,7 @@ CGAL_BINARY_DIR:STATIC=C:/CGAL/trunk/Maintenance/infrastructure/delaunay.geometr
CGAL_Boost_USE_STATIC_LIBS:BOOL=ON
//Directory containing the Core package
CGAL_CORE_PACKAGE_DIR:PATH=C:/CGAL/CGAL-3.10-Ic-157
CGAL_CORE_PACKAGE_DIR:PATH=C:/CGAL/CGAL-4.0-Ic-253
//User-defined flags
CGAL_CXX_FLAGS:STRING=-D_HAS_ITERATOR_DEBUGGING=0 -D_CRT_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS -DCGAL_LIB_DIAGNOSTIC=1 /wd4503 /fp:strict /fp:except-
@ -63,7 +63,7 @@ CGAL_Core_BINARY_DIR:STATIC=C:/CGAL/trunk/Maintenance/infrastructure/delaunay.ge
CGAL_Core_LIB_DEPENDS:STATIC=general;C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build32/lib/libmpfr-4.lib;general;C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build32/lib/libgmp-10.lib;general;C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build32/lib/libmpfr-4.lib;general;C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build32/lib/libgmp-10.lib;
//Value Computed by CMake
CGAL_Core_SOURCE_DIR:STATIC=C:/CGAL/CGAL-3.10-Ic-157/src/CGALCore
CGAL_Core_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/src/CGALCore
//Set this to TRUE if you want to define or modify any of CMAKE_*_FLAGS.
// When this is FALSE, all the CMAKE_*_FLAGS flags are overriden
@ -73,7 +73,7 @@ CGAL_Core_SOURCE_DIR:STATIC=C:/CGAL/CGAL-3.10-Ic-157/src/CGALCore
CGAL_DONT_OVERRIDE_CMAKE_FLAGS:BOOL=TRUE
//Directory containing the Installation package
CGAL_INSTALLATION_PACKAGE_DIR:PATH=C:/CGAL/CGAL-3.10-Ic-157
CGAL_INSTALLATION_PACKAGE_DIR:PATH=C:/CGAL/CGAL-4.0-Ic-253
//The folder where CGAL user-side scripts will be installed, relative
// to CMAKE_INSTALL_PREFIX
@ -110,7 +110,7 @@ CGAL_ImageIO_BINARY_DIR:STATIC=C:/CGAL/trunk/Maintenance/infrastructure/delaunay
CGAL_ImageIO_LIB_DEPENDS:STATIC=general;C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build32/lib/libmpfr-4.lib;general;C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build32/lib/libgmp-10.lib;general;C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build32/lib/libmpfr-4.lib;general;C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build32/lib/libgmp-10.lib;general;glu32;general;opengl32;general;C:/CGAL/zlib/lib/zdll.lib;
//Value Computed by CMake
CGAL_ImageIO_SOURCE_DIR:STATIC=C:/CGAL/CGAL-3.10-Ic-157/src/CGALImageIO
CGAL_ImageIO_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/src/CGALImageIO
//The CGAL library
CGAL_LIBRARY:STRING=
@ -119,22 +119,22 @@ CGAL_LIBRARY:STRING=
CGAL_LIB_DEPENDS:STATIC=general;C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build32/lib/libmpfr-4.lib;general;C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build32/lib/libgmp-10.lib;
//Directory containing the Maintenance package
CGAL_MAINTENANCE_PACKAGE_DIR:PATH=C:/CGAL/CGAL-3.10-Ic-157
CGAL_MAINTENANCE_PACKAGE_DIR:PATH=C:/CGAL/CGAL-4.0-Ic-253
//Value Computed by CMake
CGAL_PDB_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.10-Ic-157/reference-builds/i686_Cygwin-Vista_MSVS2008-Release-32bits/src/CGALPDB
CGAL_PDB_BINARY_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/reference-builds/i686_Cygwin-Vista_MSVS2008-Release-32bits/src/CGALPDB
//Dependencies for the target
CGAL_PDB_LIB_DEPENDS:STATIC=general;psapi.lib;general;psapi.lib;
//Value Computed by CMake
CGAL_PDB_SOURCE_DIR:STATIC=C:/CGAL/CGAL-3.10-Ic-157/src/CGALPDB
CGAL_PDB_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/src/CGALPDB
//Value Computed by CMake
CGAL_Qt3_BINARY_DIR:STATIC=C:/CGAL/trunk/Maintenance/infrastructure/delaunay.geometryfactory.com/reference-platforms/i686_Cygwin-Vista_MSVS2008-Release-32bits/src/CGALQt
//Value Computed by CMake
CGAL_Qt3_SOURCE_DIR:STATIC=C:/CGAL/CGAL-3.10-Ic-157/src/CGALQt
CGAL_Qt3_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/src/CGALQt
//Value Computed by CMake
CGAL_Qt4_BINARY_DIR:STATIC=C:/CGAL/trunk/Maintenance/infrastructure/delaunay.geometryfactory.com/reference-platforms/i686_Cygwin-Vista_MSVS2008-Release-32bits/src/Qt4
@ -143,13 +143,13 @@ CGAL_Qt4_BINARY_DIR:STATIC=C:/CGAL/trunk/Maintenance/infrastructure/delaunay.geo
CGAL_Qt4_LIB_DEPENDS:STATIC=general;C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build32/lib/libmpfr-4.lib;general;C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build32/lib/libgmp-10.lib;general;C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build32/lib/libmpfr-4.lib;general;C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build32/lib/libgmp-10.lib;optimized;C:/Qt/4.5.1/lib/qtmain.lib;debug;C:/Qt/4.5.1/lib/qtmaind.lib;optimized;C:/Qt/4.5.1/lib/QtOpenGL4.lib;debug;C:/Qt/4.5.1/lib/QtOpenGLd4.lib;optimized;C:/Qt/4.5.1/lib/QtGui4.lib;debug;C:/Qt/4.5.1/lib/QtGuid4.lib;optimized;C:/Qt/4.5.1/lib/QtCore4.lib;debug;C:/Qt/4.5.1/lib/QtCored4.lib;general;glu32;general;opengl32;
//Value Computed by CMake
CGAL_Qt4_SOURCE_DIR:STATIC=C:/CGAL/CGAL-3.10-Ic-157/src/CGALQt4
CGAL_Qt4_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/src/CGALQt4
//soname-version
CGAL_SONAME_VERSION:STRING=3
//Value Computed by CMake
CGAL_SOURCE_DIR:STATIC=C:/CGAL/CGAL-3.10-Ic-157
CGAL_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253
//soversion
CGAL_SOVERSION:STRING=3.0.1
@ -1011,7 +1011,7 @@ Boost_INCLUDE_DIR-ADVANCED:INTERNAL=1
//ADVANCED property for variable: Boost_LIBRARY_DIRS
Boost_LIBRARY_DIRS-ADVANCED:INTERNAL=1
//The library version string for boost libraries
Boost_LIB_VERSION:INTERNAL=1_46
Boost_LIB_VERSION:INTERNAL=1_49
//Whether the Boost THREAD library found
Boost_THREAD_FOUND:INTERNAL=ON
//ADVANCED property for variable: Boost_THREAD_LIBRARY
@ -1021,11 +1021,11 @@ Boost_THREAD_LIBRARY_DEBUG-ADVANCED:INTERNAL=1
//ADVANCED property for variable: Boost_THREAD_LIBRARY_RELEASE
Boost_THREAD_LIBRARY_RELEASE-ADVANCED:INTERNAL=1
//The version number for boost libraries
Boost_VERSION:INTERNAL=104600
Boost_VERSION:INTERNAL=104900
CGAL_3RD_PARTY_DEFINITIONS:INTERNAL=-DCGAL_NO_AUTOLINK_MPFR;-DCGAL_NO_AUTOLINK_GMP
CGAL_3RD_PARTY_INCLUDE_DIRS:INTERNAL=C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build32/include;C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build32/include;C:/CGAL/boost_1_46_0
CGAL_3RD_PARTY_INCLUDE_DIRS:INTERNAL=C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build32/include;C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build32/include;C:/CGAL/boost-release-branch
CGAL_3RD_PARTY_LIBRARIES:INTERNAL=C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build32/lib/libmpfr-4.lib;C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build32/lib/libgmp-10.lib
CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build32/lib;C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build32/lib;C:/CGAL/boost_1_46_0/stage/lib;C:/CGAL/boost_1_46_0/stage/lib;C:/CGAL/boost_1_46_0/stage/lib;C:/CGAL/boost_1_46_0/stage/lib
CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build32/lib;C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build32/lib;C:/CGAL/boost-release-branch/stage/lib;C:/CGAL/boost-release-branch/stage/lib
//ADVANCED property for variable: CGAL_AUTO_LINK_GMP
CGAL_AUTO_LINK_GMP-ADVANCED:INTERNAL=1
//ADVANCED property for variable: CGAL_AUTO_LINK_MPFR
@ -1116,9 +1116,9 @@ CGAL_CFG_NO_LIMITS_COMPILED:INTERNAL=TRUE
CGAL_CFG_NO_LOGICAL_OPERATORS_ALTERNATIVES:INTERNAL=1
//Result of TRY_COMPILE
CGAL_CFG_NO_LOGICAL_OPERATORS_ALTERNATIVES_COMPILED:INTERNAL=FALSE
CGAL_CFG_NO_MESSAGE_PRAGMA_BUG:INTERNAL=1
CGAL_CFG_NO_MESSAGE_PRAGMA_BUG:INTERNAL=0
//Result of TRY_COMPILE
CGAL_CFG_NO_MESSAGE_PRAGMA_BUG_COMPILED:INTERNAL=FALSE
CGAL_CFG_NO_MESSAGE_PRAGMA_BUG_COMPILED:INTERNAL=TRUE
CGAL_CFG_NO_NEXTAFTER:INTERNAL=1
//Result of TRY_COMPILE
CGAL_CFG_NO_NEXTAFTER_COMPILED:INTERNAL=FALSE
@ -1217,7 +1217,7 @@ CMAKE_CACHE_MAJOR_VERSION:INTERNAL=2
//Minor version of cmake used to create the current loaded cache
CMAKE_CACHE_MINOR_VERSION:INTERNAL=8
//Patch version of cmake used to create the current loaded cache
CMAKE_CACHE_PATCH_VERSION:INTERNAL=4
CMAKE_CACHE_PATCH_VERSION:INTERNAL=6
//Major version of cmake used to create the current loaded cache
CMAKE_CACHE_RELEASE_VERSION:INTERNAL=patch 4
//ADVANCED property for variable: CMAKE_COLOR_MAKEFILE
@ -1280,7 +1280,7 @@ CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
CMAKE_GENERATOR:INTERNAL=NMake Makefiles
//Start directory with the top level CMakeLists.txt file for this
// project
CMAKE_HOME_DIRECTORY:INTERNAL=C:/CGAL/CGAL-3.10-Ic-157
CMAKE_HOME_DIRECTORY:INTERNAL=C:/CGAL/CGAL-4.0-Ic-253
//ADVANCED property for variable: CMAKE_LINKER
CMAKE_LINKER-ADVANCED:INTERNAL=1
//ADVANCED property for variable: CMAKE_MAKE_PROGRAM
@ -1325,13 +1325,13 @@ CMAKE_UNAME:INTERNAL=C:/cygwin/bin/uname.exe
CMAKE_USE_RELATIVE_PATHS-ADVANCED:INTERNAL=1
//ADVANCED property for variable: CMAKE_VERBOSE_MAKEFILE
CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1
CONFIG_CXX_FLAGS:INTERNAL= /DWIN32 /D_WINDOWS /W3 /Zm2000 /EHsc /GR -D_CRT_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS -DCGAL_LIB_DIAGNOSTIC=1 /wd4503 /fp:strict /fp:except-
CONFIG_CXX_FLAGS:INTERNAL=-D_HAS_ITERATOR_DEBUGGING=0 /DWIN32 /D_WINDOWS /W3 /Zm2000 /EHsc /GR -D_CRT_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS -DCGAL_LIB_DIAGNOSTIC=1 /wd4503 /fp:strict /fp:except-
//Variable hidden from user
EXECUTABLE_OUTPUT_PATH:INTERNAL=
//Details about finding OpenGL
FIND_PACKAGE_MESSAGE_DETAILS_OpenGL:INTERNAL=[opengl32][v()]
//Details about finding ZLIB
FIND_PACKAGE_MESSAGE_DETAILS_ZLIB:INTERNAL=[C:/CGAL/zlib/include][C:/CGAL/zlib/lib/zdll.lib][v1.2.3()]
FIND_PACKAGE_MESSAGE_DETAILS_ZLIB:INTERNAL=[C:/CGAL/zlib/lib/zdll.lib][C:/CGAL/zlib/include][v1.2.3()]
//Result of TRY_COMPILE
GMP_COMPILE_RES:INTERNAL=TRUE
GMP_IN_CGAL_AUXILIARY:INTERNAL=TRUE

View File

@ -89,10 +89,9 @@ export COLLECT_DEMOS_BINARIES
source /cygdrive/c/cgal/RSCube/setup-rs-32
BOOST_ROOT='C:/cgal/boost_1_46_0'
BOOST_LIBRARYDIR='C:/cgal/boost_1_46_0/stage/lib'
BOOST_INCLUDEDIR='C:/cgal/boost_1_46_0'
export BOOST_ROOT BOOST_LIBRARYDIR BOOST_INCLUDEDIR
BOOST_LIBRARYDIR='C:/cgal/boost-release-branch/stage/lib'
BOOST_INCLUDEDIR='C:/cgal/boost-release-branch'
export BOOST_LIBRARYDIR BOOST_INCLUDEDIR
# This variable is for src/CGAL_Qt4/CMakeLists.txt, so that the
# CGAL_Qt4.lib contains the release version string of the public release,

View File

@ -15,70 +15,70 @@
########################
//Value Computed by CMake
AABB_examples_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/AABB_tree
AABB_examples_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/AABB_tree
//Value Computed by CMake
AK_test_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Arrangement_on_surface_2_extension
AK_test_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Arrangement_on_surface_2_extension
//Value Computed by CMake
Algebraic_foundations_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Algebraic_foundations
//Value Computed by CMake
Algebraic_foundations_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Algebraic_foundations
Algebraic_foundations_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Algebraic_foundations
//Value Computed by CMake
Algebraic_kernel_d_test_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Algebraic_kernel_d
//Value Computed by CMake
Algebraic_kernel_d_test_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Algebraic_kernel_d
Algebraic_kernel_d_test_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Algebraic_kernel_d
//Value Computed by CMake
Alpha_shapes_2_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Alpha_shapes_2
//Value Computed by CMake
Alpha_shapes_2_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Alpha_shapes_2
Alpha_shapes_2_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Alpha_shapes_2
//Value Computed by CMake
Alpha_shapes_3_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Alpha_shapes_3
//Value Computed by CMake
Alpha_shapes_3_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Alpha_shapes_3
Alpha_shapes_3_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Alpha_shapes_3
//Value Computed by CMake
Apollonius_graph_2_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Apollonius_graph_2
//Value Computed by CMake
Apollonius_graph_2_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Apollonius_graph_2
Apollonius_graph_2_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Apollonius_graph_2
//Value Computed by CMake
Approximate_min_ellipsoid_d_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Approximate_min_ellipsoid_d
//Value Computed by CMake
Approximate_min_ellipsoid_d_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Approximate_min_ellipsoid_d
Approximate_min_ellipsoid_d_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Approximate_min_ellipsoid_d
//Value Computed by CMake
Arrangement_on_surface_2_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Arrangement_on_surface_2
//Value Computed by CMake
Arrangement_on_surface_2_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Arrangement_on_surface_2
Arrangement_on_surface_2_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Arrangement_on_surface_2
//Value Computed by CMake
BGL_arrangement_2_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/BGL_arrangement_2
//Value Computed by CMake
BGL_arrangement_2_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/BGL_arrangement_2
BGL_arrangement_2_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/BGL_arrangement_2
//Value Computed by CMake
BGL_polyhedron_3_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/BGL_polyhedron_3
//Value Computed by CMake
BGL_polyhedron_3_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/BGL_polyhedron_3
BGL_polyhedron_3_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/BGL_polyhedron_3
//Value Computed by CMake
BGL_triangulation_2_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/BGL_triangulation_2
//Value Computed by CMake
BGL_triangulation_2_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/BGL_triangulation_2
BGL_triangulation_2_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/BGL_triangulation_2
//Build shared libraries
BUILD_SHARED_LIBS:BOOL=ON
@ -87,31 +87,31 @@ BUILD_SHARED_LIBS:BOOL=ON
Boolean_set_operations_2_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Boolean_set_operations_2
//Value Computed by CMake
Boolean_set_operations_2_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Boolean_set_operations_2
Boolean_set_operations_2_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Boolean_set_operations_2
//Path to a file.
Boost_INCLUDE_DIR:PATH=C:/CGAL/boost_1_44_0
Boost_INCLUDE_DIR:PATH=C:/CGAL/boost-release-branch
//Boost library directory
Boost_LIBRARY_DIRS:FILEPATH=C:/CGAL/boost_1_44_0/stage64/lib;C:/CGAL/boost_1_44_0/stage64/lib
Boost_LIBRARY_DIRS:FILEPATH=C:/CGAL/boost-release-branch/stage64/lib;C:/CGAL/boost-release-branch/stage64/lib
//Boost diagnostic define
Boost_LIB_DIAGNOSTIC_DEFINITIONS:STRING=-DBOOST_LIB_DIAGNOSTIC
//The Boost THREAD library
Boost_THREAD_LIBRARY:FILEPATH=optimized;C:/CGAL/boost_1_44_0/stage64/lib/libboost_thread-vc100-mt-1_44.lib;debug;C:/CGAL/boost_1_44_0/stage64/lib/libboost_thread-vc100-mt-gd-1_44.lib
Boost_THREAD_LIBRARY:FILEPATH=optimized;C:/CGAL/boost-release-branch/stage64/lib/boost_thread-vc100-mt-1_49.lib;debug;C:/CGAL/boost-release-branch/stage64/lib/boost_thread-vc100-mt-gd-1_49.lib
//Path to a library.
Boost_THREAD_LIBRARY_DEBUG:FILEPATH=C:/CGAL/boost_1_44_0/stage64/lib/libboost_thread-vc100-mt-gd-1_44.lib
Boost_THREAD_LIBRARY_DEBUG:FILEPATH=C:/CGAL/boost-release-branch/stage64/lib/boost_thread-vc100-mt-gd-1_49.lib
//Path to a library.
Boost_THREAD_LIBRARY_RELEASE:FILEPATH=C:/CGAL/boost_1_44_0/stage64/lib/libboost_thread-vc100-mt-1_44.lib
Boost_THREAD_LIBRARY_RELEASE:FILEPATH=C:/CGAL/boost-release-branch/stage64/lib/boost_thread-vc100-mt-1_49.lib
//Value Computed by CMake
Box_intersection_d_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Box_intersection_d
//Value Computed by CMake
Box_intersection_d_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Box_intersection_d
Box_intersection_d_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Box_intersection_d
//Enable/Disable auto-linking for the external library GMP
CGAL_AUTO_LINK_GMP:BOOL=OFF
@ -126,10 +126,10 @@ CGAL_BINARY_DIR:STATIC=C:/CGAL/trunk/Maintenance/infrastructure/delaunay.geometr
CGAL_Boost_USE_STATIC_LIBS:BOOL=OFF
//Directory containing the Core package
CGAL_CORE_PACKAGE_DIR:PATH=C:/CGAL/CGAL-4.0-Ic-248
CGAL_CORE_PACKAGE_DIR:PATH=C:/CGAL/CGAL-4.0-Ic-253
//User-defined flags
CGAL_CXX_FLAGS:STRING=-D_HAS_ITERATOR_DEBUGGING=0 -DCGAL_INCLUDE_WINDOWS_DOT_H -IC:/CGAL/boost_1_44_0-patch -D_CRT_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS /fp:strict /fp:except- /bigobj -IC:/CGAL/boost_1_44_0-patch /wd4503
CGAL_CXX_FLAGS:STRING=-D_HAS_ITERATOR_DEBUGGING=0 -DCGAL_INCLUDE_WINDOWS_DOT_H -D_CRT_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS /fp:strict /fp:except- /bigobj /wd4503
//Value Computed by CMake
CGAL_Core_BINARY_DIR:STATIC=C:/CGAL/trunk/Maintenance/infrastructure/delaunay.geometryfactory.com/reference-platforms/x64_Cygwin-Vista_MSVS2010-64bits/src/Core
@ -138,7 +138,7 @@ CGAL_Core_BINARY_DIR:STATIC=C:/CGAL/trunk/Maintenance/infrastructure/delaunay.ge
CGAL_Core_LIB_DEPENDS:STATIC=general;C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build64/lib/libmpfr-4.lib;general;C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build64/lib/libgmp-10.lib;general;C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build64/lib/libmpfr-4.lib;general;C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build64/lib/libgmp-10.lib;
//Value Computed by CMake
CGAL_Core_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/src/CGALCore
CGAL_Core_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/src/CGALCore
//Set this to TRUE if you want to define or modify any of CMAKE_*_FLAGS.
// When this is FALSE, all the CMAKE_*_FLAGS flags are overriden
@ -151,10 +151,10 @@ CGAL_DONT_OVERRIDE_CMAKE_FLAGS:BOOL=TRUE
CGAL_EXAMPLES_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples
//Value Computed by CMake
CGAL_EXAMPLES_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples
CGAL_EXAMPLES_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples
//Directory containing the Installation package
CGAL_INSTALLATION_PACKAGE_DIR:PATH=C:/CGAL/CGAL-4.0-Ic-248
CGAL_INSTALLATION_PACKAGE_DIR:PATH=C:/CGAL/CGAL-4.0-Ic-253
//The folder where CGAL user-side scripts will be installed, relative
// to CMAKE_INSTALL_PREFIX
@ -166,7 +166,7 @@ CGAL_INSTALL_CMAKE_DIR:STRING=lib/CGAL
//The folder where CGAL documentation and license files will be
// installed, relative to CMAKE_INSTALL_PREFIX
CGAL_INSTALL_DOC_DIR:STRING=share/doc/CGAL-4.0-Ic-248
CGAL_INSTALL_DOC_DIR:STRING=share/doc/CGAL-4.0-Ic-253
//The folder where CGAL header files will be installed, relative
// to CMAKE_INSTALL_PREFIX
@ -187,7 +187,7 @@ CGAL_ImageIO_BINARY_DIR:STATIC=C:/CGAL/trunk/Maintenance/infrastructure/delaunay
CGAL_ImageIO_LIB_DEPENDS:STATIC=general;C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build64/lib/libmpfr-4.lib;general;C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build64/lib/libgmp-10.lib;general;C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build64/lib/libmpfr-4.lib;general;C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build64/lib/libgmp-10.lib;general;glu32;general;opengl32;general;C:/CGAL/zlib-1.2.5/zlib1.lib;
//Value Computed by CMake
CGAL_ImageIO_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/src/CGALImageIO
CGAL_ImageIO_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/src/CGALImageIO
//The CGAL library
CGAL_LIBRARY:STRING=
@ -196,13 +196,13 @@ CGAL_LIBRARY:STRING=
CGAL_LIB_DEPENDS:STATIC=general;C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build64/lib/libmpfr-4.lib;general;C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build64/lib/libgmp-10.lib;
//Directory containing the Maintenance package
CGAL_MAINTENANCE_PACKAGE_DIR:PATH=C:/CGAL/CGAL-4.0-Ic-248
CGAL_MAINTENANCE_PACKAGE_DIR:PATH=C:/CGAL/CGAL-4.0-Ic-253
//Value Computed by CMake
CGAL_Qt3_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/src/CGALQt
//Value Computed by CMake
CGAL_Qt3_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/src/CGALQt
CGAL_Qt3_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/src/CGALQt
//Value Computed by CMake
CGAL_Qt4_BINARY_DIR:STATIC=C:/CGAL/trunk/Maintenance/infrastructure/delaunay.geometryfactory.com/reference-platforms/x64_Cygwin-Vista_MSVS2010-64bits/src/Qt4
@ -211,13 +211,13 @@ CGAL_Qt4_BINARY_DIR:STATIC=C:/CGAL/trunk/Maintenance/infrastructure/delaunay.geo
CGAL_Qt4_LIB_DEPENDS:STATIC=general;C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build64/lib/libmpfr-4.lib;general;C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build64/lib/libgmp-10.lib;general;C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build64/lib/libmpfr-4.lib;general;C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build64/lib/libgmp-10.lib;optimized;C:/Qt/4.8.0/lib/qtmain.lib;debug;C:/Qt/4.8.0/lib/qtmaind.lib;optimized;C:/Qt/4.8.0/lib/QtOpenGL4.lib;debug;C:/Qt/4.8.0/lib/QtOpenGLd4.lib;optimized;C:/Qt/4.8.0/lib/QtGui4.lib;debug;C:/Qt/4.8.0/lib/QtGuid4.lib;optimized;C:/Qt/4.8.0/lib/QtCore4.lib;debug;C:/Qt/4.8.0/lib/QtCored4.lib;general;glu32;general;opengl32;
//Value Computed by CMake
CGAL_Qt4_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/src/CGALQt4
CGAL_Qt4_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/src/CGALQt4
//soname-version
CGAL_SONAME_VERSION:STRING=6
//Value Computed by CMake
CGAL_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248
CGAL_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253
//soversion
CGAL_SOVERSION:STRING=6.0.0
@ -226,13 +226,13 @@ CGAL_SOVERSION:STRING=6.0.0
CGAL_ipelets_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/CGAL_ipelets
//Value Computed by CMake
CGAL_ipelets_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/CGAL_ipelets
CGAL_ipelets_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/CGAL_ipelets
//Value Computed by CMake
CGALimageIO_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/CGALimageIO
//Value Computed by CMake
CGALimageIO_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/CGALimageIO
CGALimageIO_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/CGALimageIO
//For backwards compatibility, what version of CMake commands and
// syntax should this version of CMake try to support.
@ -249,7 +249,7 @@ CMAKE_COLOR_MAKEFILE:BOOL=OFF
CMAKE_CXX_COMPILER:FILEPATH=C:/Program Files (x86)/Microsoft Visual Studio 10.0/VC/bin/amd64/cl.exe
//User-defined flags
CMAKE_CXX_FLAGS:STRING=-D_HAS_ITERATOR_DEBUGGING=0 /DWIN32 /D_WINDOWS /W3 /Zm2000 /EHsc /GR -D_CRT_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS /fp:strict /fp:except- /bigobj -IC:/CGAL/boost_1_44_0-patch /wd4503 -DCGAL_INCLUDE_WINDOWS_DOT_H
CMAKE_CXX_FLAGS:STRING=-D_HAS_ITERATOR_DEBUGGING=0 /DWIN32 /D_WINDOWS /W3 /Zm2000 /EHsc /GR -D_CRT_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS /fp:strict /fp:except- /bigobj /wd4503 -DCGAL_INCLUDE_WINDOWS_DOT_H
//Flags used by the compiler during debug builds.
CMAKE_CXX_FLAGS_DEBUG:STRING=/D_DEBUG /MDd /Ob0 /Od /RTC1
@ -370,67 +370,67 @@ CMAKE_VERBOSE_MAKEFILE:BOOL=ON
Circular_kernel_2_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Circular_kernel_2
//Value Computed by CMake
Circular_kernel_2_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Circular_kernel_2
Circular_kernel_2_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Circular_kernel_2
//Value Computed by CMake
Circular_kernel_3_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Circular_kernel_3
//Value Computed by CMake
Circular_kernel_3_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Circular_kernel_3
Circular_kernel_3_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Circular_kernel_3
//Value Computed by CMake
Circulator_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Circulator
//Value Computed by CMake
Circulator_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Circulator
Circulator_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Circulator
//Value Computed by CMake
Convex_decomposition_3_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Convex_decomposition_3
//Value Computed by CMake
Convex_decomposition_3_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Convex_decomposition_3
Convex_decomposition_3_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Convex_decomposition_3
//Value Computed by CMake
Convex_hull_2_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Convex_hull_2
//Value Computed by CMake
Convex_hull_2_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Convex_hull_2
Convex_hull_2_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Convex_hull_2
//Value Computed by CMake
Convex_hull_3_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Convex_hull_3
//Value Computed by CMake
Convex_hull_3_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Convex_hull_3
Convex_hull_3_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Convex_hull_3
//Value Computed by CMake
Core_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Core
//Value Computed by CMake
Core_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Core
Core_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Core
//Value Computed by CMake
Developers_manual_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Developers_manual
//Value Computed by CMake
Developers_manual_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Developers_manual
Developers_manual_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Developers_manual
//Value Computed by CMake
Envelope_2_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Envelope_2
//Value Computed by CMake
Envelope_2_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Envelope_2
Envelope_2_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Envelope_2
//Value Computed by CMake
Envelope_3_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Envelope_3
//Value Computed by CMake
Envelope_3_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Envelope_3
Envelope_3_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Envelope_3
//Value Computed by CMake
Filtered_kernel_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Filtered_kernel
//Value Computed by CMake
Filtered_kernel_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Filtered_kernel
Filtered_kernel_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Filtered_kernel
//The directory containing the GMP header files
GMP_INCLUDE_DIR:PATH=C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build64/include
@ -444,55 +444,55 @@ GMP_LIBRARIES_DIR:FILEPATH=C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build64/li
Generator_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Generator
//Value Computed by CMake
Generator_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Generator
Generator_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Generator
//Value Computed by CMake
HalfedgeDS_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/HalfedgeDS
//Value Computed by CMake
HalfedgeDS_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/HalfedgeDS
HalfedgeDS_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/HalfedgeDS
//Value Computed by CMake
Interpolation_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Interpolation
//Value Computed by CMake
Interpolation_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Interpolation
Interpolation_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Interpolation
//Value Computed by CMake
Interval_skip_list_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Interval_skip_list
//Value Computed by CMake
Interval_skip_list_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Interval_skip_list
Interval_skip_list_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Interval_skip_list
//Value Computed by CMake
Jet_fitting_3_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Jet_fitting_3
//Value Computed by CMake
Jet_fitting_3_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Jet_fitting_3
Jet_fitting_3_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Jet_fitting_3
//Value Computed by CMake
Kernel_23_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Kernel_23
//Value Computed by CMake
Kernel_23_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Kernel_23
Kernel_23_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Kernel_23
//Value Computed by CMake
Kinetic_data_structures_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Kinetic_data_structures
//Value Computed by CMake
Kinetic_data_structures_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Kinetic_data_structures
Kinetic_data_structures_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Kinetic_data_structures
//Value Computed by CMake
Kinetic_framework_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Kinetic_framework
//Value Computed by CMake
Kinetic_framework_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Kinetic_framework
Kinetic_framework_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Kinetic_framework
//Value Computed by CMake
Largest_empty_rect_2_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Largest_empty_rect_2
//Value Computed by CMake
Largest_empty_rect_2_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Largest_empty_rect_2
Largest_empty_rect_2_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Largest_empty_rect_2
//The directory containing the MPFR header files
MPFR_INCLUDE_DIR:PATH=C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build64/include
@ -506,91 +506,91 @@ MPFR_LIBRARIES_DIR:FILEPATH=C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build64/l
Matrix_search_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Matrix_search
//Value Computed by CMake
Matrix_search_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Matrix_search
Matrix_search_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Matrix_search
//Value Computed by CMake
Mesh_2_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Mesh_2
//Value Computed by CMake
Mesh_2_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Mesh_2
Mesh_2_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Mesh_2
//Value Computed by CMake
Mesh_3_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Mesh_3
//Value Computed by CMake
Mesh_3_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Mesh_3
Mesh_3_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Mesh_3
//Value Computed by CMake
Min_annulus_d_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Min_annulus_d
//Value Computed by CMake
Min_annulus_d_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Min_annulus_d
Min_annulus_d_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Min_annulus_d
//Value Computed by CMake
Min_circle_2_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Min_circle_2
//Value Computed by CMake
Min_circle_2_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Min_circle_2
Min_circle_2_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Min_circle_2
//Value Computed by CMake
Min_ellipse_2_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Min_ellipse_2
//Value Computed by CMake
Min_ellipse_2_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Min_ellipse_2
Min_ellipse_2_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Min_ellipse_2
//Value Computed by CMake
Min_quadrilateral_2_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Min_quadrilateral_2
//Value Computed by CMake
Min_quadrilateral_2_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Min_quadrilateral_2
Min_quadrilateral_2_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Min_quadrilateral_2
//Value Computed by CMake
Min_sphere_d_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Min_sphere_d
//Value Computed by CMake
Min_sphere_d_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Min_sphere_d
Min_sphere_d_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Min_sphere_d
//Value Computed by CMake
Min_sphere_of_spheres_d_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Min_sphere_of_spheres_d
//Value Computed by CMake
Min_sphere_of_spheres_d_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Min_sphere_of_spheres_d
Min_sphere_of_spheres_d_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Min_sphere_of_spheres_d
//Value Computed by CMake
Minkowski_sum_2_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Minkowski_sum_2
//Value Computed by CMake
Minkowski_sum_2_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Minkowski_sum_2
Minkowski_sum_2_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Minkowski_sum_2
//Value Computed by CMake
Minkowski_sum_3_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Minkowski_sum_3
//Value Computed by CMake
Minkowski_sum_3_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Minkowski_sum_3
Minkowski_sum_3_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Minkowski_sum_3
//Value Computed by CMake
Modular_arithmetic_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Modular_arithmetic
//Value Computed by CMake
Modular_arithmetic_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Modular_arithmetic
Modular_arithmetic_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Modular_arithmetic
//Value Computed by CMake
Nef_2_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Nef_2
//Value Computed by CMake
Nef_2_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Nef_2
Nef_2_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Nef_2
//Value Computed by CMake
Nef_3_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Nef_3
//Value Computed by CMake
Nef_3_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Nef_3
Nef_3_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Nef_3
//Value Computed by CMake
Nef_S2_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Nef_S2
//Value Computed by CMake
Nef_S2_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Nef_S2
Nef_S2_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Nef_S2
//OpenGL library for win32
OPENGL_gl_LIBRARY:STRING=opengl32
@ -602,79 +602,79 @@ OPENGL_glu_LIBRARY:STRING=glu32
Partition_2_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Partition_2
//Value Computed by CMake
Partition_2_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Partition_2
Partition_2_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Partition_2
//Value Computed by CMake
Periodic_3_triangulation_3_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Periodic_3_triangulation_3
//Value Computed by CMake
Periodic_3_triangulation_3_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Periodic_3_triangulation_3
Periodic_3_triangulation_3_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Periodic_3_triangulation_3
//Value Computed by CMake
Point_set_2_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Point_set_2
//Value Computed by CMake
Point_set_2_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Point_set_2
Point_set_2_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Point_set_2
//Value Computed by CMake
Point_set_processing_3_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Point_set_processing_3
//Value Computed by CMake
Point_set_processing_3_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Point_set_processing_3
Point_set_processing_3_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Point_set_processing_3
//Value Computed by CMake
Polygon_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Polygon
//Value Computed by CMake
Polygon_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Polygon
Polygon_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Polygon
//Value Computed by CMake
Polyhedron_IO_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Polyhedron_IO
//Value Computed by CMake
Polyhedron_IO_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Polyhedron_IO
Polyhedron_IO_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Polyhedron_IO
//Value Computed by CMake
Polyhedron_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Polyhedron
//Value Computed by CMake
Polyhedron_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Polyhedron
Polyhedron_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Polyhedron
//Value Computed by CMake
Polynomial_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Polynomial
//Value Computed by CMake
Polynomial_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Polynomial
Polynomial_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Polynomial
//Value Computed by CMake
Polynomial_kernel_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Polynomial_kernel
//Value Computed by CMake
Polynomial_kernel_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Polynomial_kernel
Polynomial_kernel_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Polynomial_kernel
//Value Computed by CMake
Polytope_distance_d_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Polytope_distance_d
//Value Computed by CMake
Polytope_distance_d_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Polytope_distance_d
Polytope_distance_d_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Polytope_distance_d
//Value Computed by CMake
Principal_component_analysis_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Principal_component_analysis
//Value Computed by CMake
Principal_component_analysis_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Principal_component_analysis
Principal_component_analysis_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Principal_component_analysis
//Value Computed by CMake
Profiling_tools_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Profiling_tools
//Value Computed by CMake
Profiling_tools_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Profiling_tools
Profiling_tools_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Profiling_tools
//Value Computed by CMake
QP_solver_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/QP_solver
//Value Computed by CMake
QP_solver_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/QP_solver
QP_solver_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/QP_solver
//path to qt3 include directory
QT3_INCLUDE_DIR:PATH=QT3_INCLUDE_DIR-NOTFOUND
@ -1331,109 +1331,109 @@ QT_WORLDTIMECLOCKPLUGIN_PLUGIN_RELEASE:FILEPATH=C:/Qt/4.8.0/plugins/designer/wor
RangeSegmentTrees_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/RangeSegmentTrees
//Value Computed by CMake
RangeSegmentTrees_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/RangeSegmentTrees
RangeSegmentTrees_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/RangeSegmentTrees
//Value Computed by CMake
Ridges_3_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Ridges_3
//Value Computed by CMake
Ridges_3_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Ridges_3
Ridges_3_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Ridges_3
//Value Computed by CMake
STL_Extension_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/STL_Extension
//Value Computed by CMake
STL_Extension_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/STL_Extension
STL_Extension_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/STL_Extension
//Value Computed by CMake
Segment_Delaunay_graph_2_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Segment_Delaunay_graph_2
//Value Computed by CMake
Segment_Delaunay_graph_2_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Segment_Delaunay_graph_2
Segment_Delaunay_graph_2_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Segment_Delaunay_graph_2
//Value Computed by CMake
Skin_surface_3_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Skin_surface_3
//Value Computed by CMake
Skin_surface_3_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Skin_surface_3
Skin_surface_3_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Skin_surface_3
//Value Computed by CMake
Snap_rounding_2_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Snap_rounding_2
//Value Computed by CMake
Snap_rounding_2_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Snap_rounding_2
Snap_rounding_2_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Snap_rounding_2
//Value Computed by CMake
Spatial_searching_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Spatial_searching
//Value Computed by CMake
Spatial_searching_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Spatial_searching
Spatial_searching_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Spatial_searching
//Value Computed by CMake
Spatial_sorting_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Spatial_sorting
//Value Computed by CMake
Spatial_sorting_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Spatial_sorting
Spatial_sorting_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Spatial_sorting
//Value Computed by CMake
Straight_skeleton_2_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Straight_skeleton_2
//Value Computed by CMake
Straight_skeleton_2_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Straight_skeleton_2
Straight_skeleton_2_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Straight_skeleton_2
//Value Computed by CMake
Stream_lines_2_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Stream_lines_2
//Value Computed by CMake
Stream_lines_2_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Stream_lines_2
Stream_lines_2_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Stream_lines_2
//Value Computed by CMake
Subdivision_method_3_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Subdivision_method_3
//Value Computed by CMake
Subdivision_method_3_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Subdivision_method_3
Subdivision_method_3_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Subdivision_method_3
//Value Computed by CMake
Surface_mesh_parameterization_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Surface_mesh_parameterization
//Value Computed by CMake
Surface_mesh_parameterization_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Surface_mesh_parameterization
Surface_mesh_parameterization_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Surface_mesh_parameterization
//Value Computed by CMake
Surface_mesh_simplification_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Surface_mesh_simplification
//Value Computed by CMake
Surface_mesh_simplification_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Surface_mesh_simplification
Surface_mesh_simplification_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Surface_mesh_simplification
//Value Computed by CMake
Surface_mesher_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Surface_mesher
//Value Computed by CMake
Surface_mesher_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Surface_mesher
Surface_mesher_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Surface_mesher
//Value Computed by CMake
Surface_reconstruction_points_3_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Surface_reconstruction_points_3
//Value Computed by CMake
Surface_reconstruction_points_3_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Surface_reconstruction_points_3
Surface_reconstruction_points_3_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Surface_reconstruction_points_3
//Value Computed by CMake
Triangulation_2_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Triangulation_2
//Value Computed by CMake
Triangulation_2_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Triangulation_2
Triangulation_2_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Triangulation_2
//Value Computed by CMake
Triangulation_3_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Triangulation_3
//Value Computed by CMake
Triangulation_3_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Triangulation_3
Triangulation_3_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Triangulation_3
//Value Computed by CMake
Voronoi_diagram_2_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Voronoi_diagram_2
//Value Computed by CMake
Voronoi_diagram_2_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Voronoi_diagram_2
Voronoi_diagram_2_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Voronoi_diagram_2
//Enable CGAL component Core
WITH_CGAL_Core:BOOL=ON
@ -1472,7 +1472,7 @@ WITH_examples:BOOL=OFF
Width_3_example_BINARY_DIR:STATIC=C:/CGAL/CGAL-3.4.1/reference-builds/x64_Cygwin-Vista_MSVS2010-64bits/examples/Width_3
//Value Computed by CMake
Width_3_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-248/examples/Width_3
Width_3_example_SOURCE_DIR:STATIC=C:/CGAL/CGAL-4.0-Ic-253/examples/Width_3
//Path to a file.
ZLIB_INCLUDE_DIR:PATH=C:/CGAL/zlib-1.2.5
@ -1492,7 +1492,7 @@ Boost_INCLUDE_DIR-ADVANCED:INTERNAL=1
//ADVANCED property for variable: Boost_LIBRARY_DIRS
Boost_LIBRARY_DIRS-ADVANCED:INTERNAL=1
//The library version string for boost libraries
Boost_LIB_VERSION:INTERNAL=1_44
Boost_LIB_VERSION:INTERNAL=1_49
//Whether the Boost PROGRAM_OPTIONS library found
Boost_PROGRAM_OPTIONS_FOUND:INTERNAL=ON
//Whether the Boost THREAD library found
@ -1504,11 +1504,11 @@ Boost_THREAD_LIBRARY_DEBUG-ADVANCED:INTERNAL=1
//ADVANCED property for variable: Boost_THREAD_LIBRARY_RELEASE
Boost_THREAD_LIBRARY_RELEASE-ADVANCED:INTERNAL=1
//The version number for boost libraries
Boost_VERSION:INTERNAL=104400
Boost_VERSION:INTERNAL=104900
CGAL_3RD_PARTY_DEFINITIONS:INTERNAL=-DCGAL_NO_AUTOLINK_MPFR;-DCGAL_NO_AUTOLINK_GMP;-DBOOST_ALL_DYN_LINK;-DBOOST_ALL_DYN_LINK
CGAL_3RD_PARTY_INCLUDE_DIRS:INTERNAL=C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build64/include;C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build64/include;C:/CGAL/boost_1_44_0
CGAL_3RD_PARTY_INCLUDE_DIRS:INTERNAL=C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build64/include;C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build64/include;C:/CGAL/boost-release-branch
CGAL_3RD_PARTY_LIBRARIES:INTERNAL=C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build64/lib/libmpfr-4.lib;C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build64/lib/libgmp-10.lib
CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build64/lib;C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build64/lib;C:/CGAL/boost_1_44_0/stage64/lib;C:/CGAL/boost_1_44_0/stage64/lib;C:/CGAL/boost_1_44_0/stage64/lib;C:/CGAL/boost_1_44_0/stage64/lib
CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build64/lib;C:/CGAL/GmpMpfrCompiledWithMingw-32-and-64/build64/lib;C:/CGAL/boost-release-branch/stage64/lib;C:/CGAL/boost-release-branch/stage64/lib
//ADVANCED property for variable: CGAL_AUTO_LINK_GMP
CGAL_AUTO_LINK_GMP-ADVANCED:INTERNAL=1
//ADVANCED property for variable: CGAL_AUTO_LINK_MPFR
@ -1752,7 +1752,7 @@ CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
CMAKE_GENERATOR:INTERNAL=NMake Makefiles
//Start directory with the top level CMakeLists.txt file for this
// project
CMAKE_HOME_DIRECTORY:INTERNAL=C:/CGAL/CGAL-4.0-Ic-248
CMAKE_HOME_DIRECTORY:INTERNAL=C:/CGAL/CGAL-4.0-Ic-253
//ADVANCED property for variable: CMAKE_LINKER
CMAKE_LINKER-ADVANCED:INTERNAL=1
//ADVANCED property for variable: CMAKE_MAKE_PROGRAM
@ -1797,7 +1797,7 @@ CMAKE_UNAME:INTERNAL=C:/cygwin/bin/uname.exe
CMAKE_USE_RELATIVE_PATHS-ADVANCED:INTERNAL=1
//ADVANCED property for variable: CMAKE_VERBOSE_MAKEFILE
CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1
CONFIG_CXX_FLAGS:INTERNAL= /DWIN32 /D_WINDOWS /W3 /Zm2000 /EHsc /GR -D_CRT_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS /fp:strict /fp:except- /bigobj -IC:/CGAL/boost_1_44_0-patch /wd4503 -DCGAL_INCLUDE_WINDOWS_DOT_H
CONFIG_CXX_FLAGS:INTERNAL=-D_HAS_ITERATOR_DEBUGGING=0 /DWIN32 /D_WINDOWS /W3 /Zm2000 /EHsc /GR -D_CRT_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS /fp:strict /fp:except- /bigobj /wd4503 -DCGAL_INCLUDE_WINDOWS_DOT_H
//Variable hidden from user
EXECUTABLE_OUTPUT_PATH:INTERNAL=
//Details about finding OpenGL

View File

@ -73,10 +73,9 @@ MPFR_INC_DIR="$GMP_MPFR_ROOT/include"
GMP_LIB_DIR="$GMP_MPFR_ROOT/lib"
MPFR_LIB_DIR="$GMP_MPFR_ROOT/lib"
BOOST_ROOT='C:/cgal/boost_1_44_0'
BOOST_LIBRARYDIR='C:/cgal/boost_1_44_0/stage64/lib'
BOOST_INCLUDEDIR='C:/cgal/boost_1_44_0'
export BOOST_ROOT BOOST_LIBRARYDIR BOOST_INCLUDEDIR
BOOST_LIBRARYDIR='C:/cgal/boost-release-branch/stage64/lib'
BOOST_INCLUDEDIR='C:/cgal/boost-release-branch'
export BOOST_LIBRARYDIR BOOST_INCLUDEDIR
export PATH=`cygpath $BOOST_LIBRARYDIR`:$PATH
PATH="/cygdrive/c/cgal/GmpMpfrCompiledWithMingw-32-and-64/build64/bin:$PATH"

View File

@ -0,0 +1,3 @@
#!/bin/sh
./b2 -j2 -d+2 cxxflags=-D_HAS_ITERATOR_DEBUGGING=0 toolset=msvc-9.0 link=static --with-thread --with-date_time --with-program_options --with-filesystem --with-system debug release stage

View File

@ -0,0 +1,3 @@
#!/bin/sh
./b2 -j2 -d+2 cxxflags=-D_HAS_ITERATOR_DEBUGGING=0 --stagedir=stage64 address-model=64 toolset=msvc-10.0 link=shared --with-thread --with-date_time --with-program_options --with-filesystem --with-system debug release stage

View File

@ -87,12 +87,6 @@ if( QT3_FOUND )
add_definitions( ${CGAL_3RD_PARTY_DEFINITIONS} ${CGAL_Qt3_3RD_PARTY_DEFINITIONS} )
set( CGAL_Qt3_BASENAME CGAL_Qt3 )
if ( CGAL_INSTALL_LIB_DIR )
install(TARGETS CGAL_Qt3 DESTINATION ${CGAL_INSTALL_LIB_DIR} )
endif()
else()
message( STATUS "CGAL_Qt3 needs OpenGL, cannot be configured.")
endif()

View File

@ -48,6 +48,7 @@ DIR=stats
PREFIX1=$DIR/X
PREFIX2=$DIR/Y
EXTENSIONS="C cpp h xpm gif pcx bmp jpeg png txt html vcproj sln dsp dsw cin cout cmd nef cgal dll lib tex makefile readme"
CHECK_PATTERN="\.(`echo $EXTENSIONS | sed -e 's/ /\\|/g'`)"
if [ -e $DIR ]; then
echo error: \'$DIR\' exists, this script needs \'$DIR\' for its own purposes
@ -62,7 +63,7 @@ if [ ! -f INSTALL ]; then
exit 1
fi
licensecheck -r * | grep -Ev 'L?GPL \(v3 or later\)' | \
licensecheck -r * -c $CHECK_PATTERN | grep -Ev 'L?GPL \(v3 or later\)' | \
grep -v "^$DIR/\|^include/CGAL/CORE/\|^include/CGAL/OpenNL/\|^src/CGALCore/\|^src/CGALimageIO/\|^config/support/\|test/\|^Packages/\|^developer_scripts\|^doc_tex/\|^winutils/\|^cmake/platforms" | sort >$PREFIX1 || true
echo Note that files in the following directories are ignored:

View File

@ -28,7 +28,7 @@
!include "script_cgal.nsh"
!define CGAL_SRC "CGAL-3.9"
!define CGAL_SRC "CGAL-4.0"
!define FTP_SRC "https://cgal.geometryfactory.com/CGAL/precompiled_libs/"
;--------------------------------
@ -52,12 +52,12 @@
BrandingText "The CGAL Project and GeometryFactory - Installer created with NSIS."
VIProductVersion "3.9.0.0"
VIProductVersion "4.0.0.0"
VIAddVersionKey "ProductName" "CGAL Windows Installer"
VIAddVersionKey "CompanyName" "The CGAL Project and GeometryFactory"
VIAddVersionKey "LegalCopyright" "© The CGAL Project and GeometryFactory"
VIAddVersionKey "FileDescription" "Windows Installer for CGAL"
VIAddVersionKey "FileVersion" "3.9"
VIAddVersionKey "FileVersion" "4.0"
;--------------------------------
; Variables
@ -178,7 +178,7 @@ Section "!Main CGAL" MAIN_Idx
; Write uninstall informations
; http://nsis.sourceforge.net/Add_uninstall_information_to_Add/Remove_Programs
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${CGAL_SRC}" \
"DisplayName" "${CGAL_SRC} -- Computational Geometry Algorithms Library, version 3.9"
"DisplayName" "${CGAL_SRC} -- Computational Geometry Algorithms Library, version 4.0"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${CGAL_SRC}" \
"UninstallString" "$\"$INSTDIR\Uninstall.exe$\""
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${CGAL_SRC}" \
@ -197,7 +197,7 @@ Section "!Main CGAL" MAIN_Idx
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${CGAL_SRC}" \
"URLInfoAbout" "http://www.cgal.org/"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${CGAL_SRC}" \
"DisplayedVersion" "3.9.0"
"DisplayedVersion" "4.0.0"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${CGAL_SRC}" \
"CGALUninstallRegLoc" "$RegLoc"
@ -240,7 +240,7 @@ SectionEnd
Section /o "HTML Manuals" DOC_Idx
!ifndef FetchLocal
!insertmacro DownloadFileFrom "https://cgal.geometryfactory.com/" "CGAL/3.9/Manual/" "cgal_manual.zip" "$INSTDIR\doc_html"
!insertmacro DownloadFileFrom "https://cgal.geometryfactory.com/" "CGAL/4.0/Manual/" "cgal_manual.zip" "$INSTDIR\doc_html"
!endif
SectionEnd