merge from next

This commit is contained in:
Sébastien Loriot 2012-08-03 13:34:14 +00:00
commit ff0ae4ac7b
181 changed files with 3401 additions and 1049 deletions

11
.gitattributes vendored
View File

@ -2214,8 +2214,9 @@ Maintenance/infrastructure/renoir.geometryfactory.com/.autocgalrc -text
Maintenance/infrastructure/renoir.geometryfactory.com/boost/compile-boost -text
Maintenance/infrastructure/renoir.geometryfactory.com/boost/user-config.jam -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
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/setup -text
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16-strict-ansi/setup -text
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16/setup -text
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-13.0beta-with-g++-4.6.3-STL_F16/setup -text
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/setup -text
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_Release-F16/setup -text
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.6.2_F16-CXXDEBUG/setup -text
@ -3197,6 +3198,7 @@ Polyhedron/demo/Polyhedron/Deform_mesh.ui -text
Polyhedron/demo/Polyhedron/MainWindow.ui -text
Polyhedron/demo/Polyhedron/Polyhedron_3.qrc -text
Polyhedron/demo/Polyhedron/Polyhedron_demo_corefinement_plugin.cpp -text
Polyhedron/demo/Polyhedron/Polyhedron_demo_io_nef_plugin.cpp -text
Polyhedron/demo/Polyhedron/Polyhedron_demo_normal_estimation_plugin.cpp -text
Polyhedron/demo/Polyhedron/Polyhedron_demo_normal_estimation_plugin.ui -text
Polyhedron/demo/Polyhedron/Polyhedron_demo_off_to_xyz_plugin.cpp -text
@ -3205,10 +3207,14 @@ Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_outliers_removal_plugin.ui
Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_simplification_plugin.ui -text
Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_smoothing_plugin.cpp -text
Polyhedron/demo/Polyhedron/Polyhedron_demo_poisson_plugin.ui -text
Polyhedron/demo/Polyhedron/Polyhedron_demo_transform_polyhedron_plugin.cpp -text
Polyhedron/demo/Polyhedron/Remeshing_dialog.ui -text
Polyhedron/demo/Polyhedron/Scene_combinatorial_map_item.cpp -text
Polyhedron/demo/Polyhedron/Scene_combinatorial_map_item.h -text
Polyhedron/demo/Polyhedron/Scene_combinatorial_map_item_config.h -text
Polyhedron/demo/Polyhedron/Scene_polyhedron_transform_item.cpp -text
Polyhedron/demo/Polyhedron/Scene_polyhedron_transform_item.h -text
Polyhedron/demo/Polyhedron/Scene_polyhedron_transform_item_config.h -text
Polyhedron/demo/Polyhedron/Show_point_dialog.ui -text
Polyhedron/demo/Polyhedron/cgal_test_with_cmake eol=lf
Polyhedron/demo/Polyhedron/data/anchor.off -text svneol=unset#application/octet-stream
@ -3585,6 +3591,7 @@ Scripts/developer_scripts/create_cgal_test -text
Scripts/developer_scripts/create_cgal_test_with_cmake -text
Scripts/developer_scripts/create_demos_zip_files.sh -text
Scripts/developer_scripts/create_macosx_installer -text
Scripts/developer_scripts/detect_files_with_mixed_eol_styles -text
Scripts/developer_scripts/detect_packages_licenses -text
Scripts/developer_scripts/licensecheck -text
Scripts/developer_scripts/list_package_files.rb -text

45
.gitignore vendored
View File

@ -327,26 +327,31 @@ Maintenance/infrastructure/delaunay.geometryfactory.com/reference-platforms/x64_
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
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/config
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/include
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/localbuildscript
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/localtestscript
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/localtestscript-redo-results-collection
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/src
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/CGALConfig.cmake
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/CMakeCache.txt.backup
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/Makefile
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/config
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/include
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/lib
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/localbuildscript
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/localtestscript
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/localtestscript-redo-results-collection
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/src
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16-strict-ansi/CGALConfig.cmake
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16-strict-ansi/CMakeCache.txt.backup
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16-strict-ansi/Makefile
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16-strict-ansi/config
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16-strict-ansi/include
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16-strict-ansi/lib
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16-strict-ansi/localbuildscript
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16-strict-ansi/localtestscript
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16-strict-ansi/localtestscript-redo-results-collection
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16-strict-ansi/src
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16/CGALConfig.cmake
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16/CMakeCache.txt.backup
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16/Makefile
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16/config
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16/include
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16/lib
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16/localbuildscript
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16/localtestscript
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16/localtestscript-redo-results-collection
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16/src
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-13.0beta-with-g++-4.6.3-STL_F16/CGALConfig.cmake
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-13.0beta-with-g++-4.6.3-STL_F16/config
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-13.0beta-with-g++-4.6.3-STL_F16/include
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-13.0beta-with-g++-4.6.3-STL_F16/lib
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-13.0beta-with-g++-4.6.3-STL_F16/src
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/CGALConfig.cmake
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/CMakeCache.txt.backup
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16/Makefile

View File

@ -482,13 +482,13 @@ class Algebraic_structure_traits_base< Type_, Field_tag >
: public std::binary_function< Type, Type, bool > {
public:
bool operator()( const Type& CGAL_precondition_code(x), const Type& /* y */) const {
typedef Algebraic_structure_traits<Type> AST;
CGAL_precondition_code( typedef Algebraic_structure_traits<Type> AST);
CGAL_precondition( typename AST::Is_zero()(x) == false );
return true;
}
// second operator computing q
bool operator()( const Type& x, const Type& y, Type& q) const {
typedef Algebraic_structure_traits<Type> AST;
CGAL_precondition_code(typedef Algebraic_structure_traits<Type> AST);
CGAL_precondition( typename AST::Is_zero()(x) == false );
q = y/x;
return true;

View File

@ -264,7 +264,6 @@ public:
private:
void intern_decompose( Polynomial P_, ::CGAL::Tag_true){
typename FT_poly::Decompose decompose;
typedef typename FT_poly::Numerator_type Numerator_poly;
typename FT_poly::Numerator_type NumP;
typename FT_poly::Denominator_type dummy;

View File

@ -13,7 +13,7 @@ if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6)
endif()
# CGAL and its components
find_package( CGAL QUIET COMPONENTS Core MPFI RS3)
find_package( CGAL QUIET COMPONENTS Core RS3)
if ( NOT CGAL_FOUND )

View File

@ -174,7 +174,6 @@ namespace CGAL {
Sign sign_at( const typename AK::Polynomial_1_2 & equation,
const typename AK::Root_for_circles_2_2 & r)
{
typedef typename AK::Root_of_2 Root_of_2;
Comparison_result c = compare(r.x()*equation.a(),
-equation.c() - r.y()*equation.b());
if(c == EQUAL) return ZERO;

View File

@ -158,7 +158,6 @@ namespace CGAL {
Sign sign_at( const typename AK::Polynomial_for_circles_2_2 & equation,
const typename AK::Root_for_circles_2_2 & r)
{
typedef typename AK::Root_of_2 Root_of_2;
Comparison_result c = compare(square(r.x() - equation.a()),
equation.r_sq() -
square(r.y() - equation.b()));
@ -186,7 +185,6 @@ namespace CGAL {
x_critical_points(const typename AK::Polynomial_for_circles_2_2 & c,
OutputIterator res)
{
typedef typename AK::Root_of_2 Root_of_2;
typedef typename AK::FT FT;
typedef typename AK::Root_for_circles_2_2 Root_for_circles_2_2;
@ -216,8 +214,6 @@ namespace CGAL {
y_critical_points(const typename AK::Polynomial_for_circles_2_2 & c,
OutputIterator res)
{
typedef typename AK::Root_of_2 Root_of_2;
typedef typename AK::FT FT;
typedef typename AK::Root_for_circles_2_2 Root_for_circles_2_2;
*res++ = Root_for_circles_2_2(c.a(),

View File

@ -244,7 +244,7 @@ primal(const Edge e) const
{
typedef typename Geom_traits::Segment_2 Segment;
typedef typename Geom_traits::Ray_2 Ray;
typedef CGAL::Hyperbola_segment_2<Gt> Hyperbola_segment;
// typedef CGAL::Hyperbola_segment_2<Gt> Hyperbola_segment;
typedef CGAL::Parabola_segment_2<Gt> Parabola_segment;
// typedef typename Geom_traits::Hyperbola_segment_2 Hyperbola_segment;
// typedef typename Geom_traits::Parabola_segment_2 Parabola_segment;

View File

@ -214,7 +214,6 @@ void insert (Arrangement_on_surface_2<GeomTraits, TopTraits>& arr,
const Curve& c, const PointLocation& pl,
typename PointLocation::Point_2*)
{
typedef Arrangement_on_surface_2<GeomTraits, TopTraits> Arr;
typedef typename TopTraits::Zone_insertion_visitor Zone_visitor;
Zone_visitor visitor;
@ -1184,7 +1183,6 @@ bool is_valid (const Arrangement_on_surface_2<GeomTraits, TopTraits>& arr)
typedef Arrangement_on_surface_2<GeomTraits, TopTraits> Arr;
typedef GeomTraits Geometry_traits_2;
typedef typename Geometry_traits_2::Point_2 Point_2;
typedef typename Geometry_traits_2::X_monotone_curve_2 X_monotone_curve_2;
// Define the sweep-line types:
@ -1200,8 +1198,6 @@ bool is_valid (const Arrangement_on_surface_2<GeomTraits, TopTraits>& arr)
typedef typename Arr::Vertex_const_handle Vertex_const_handle;
typedef typename Arr::Isolated_vertex_const_iterator
Isolated_vertex_const_iterator;
typedef typename Arr::Ccb_halfedge_const_circulator
Ccb_halfedge_const_circulator;
typedef typename Arr::Halfedge_around_vertex_const_circulator
Halfedge_around_vertex_const_circulator;
@ -1454,9 +1450,6 @@ OutputIterator zone (Arrangement_on_surface_2<GeomTraits, TopTraits>& arr,
const typename GeomTraits::X_monotone_curve_2& c,
OutputIterator oi)
{
typedef Arrangement_on_surface_2<GeomTraits, TopTraits>
Arrangement_on_surface_2;
// Create a default point-location object and use it to insert the curve.
typename TopTraits::Default_point_location_strategy def_pl (arr);
@ -1585,9 +1578,6 @@ template <class GeomTraits, class TopTraits, class Curve>
bool do_intersect (Arrangement_on_surface_2<GeomTraits, TopTraits>& arr,
const Curve& c)
{
typedef Arrangement_on_surface_2<GeomTraits, TopTraits>
Arrangement_on_surface_2;
// Create a default point-location object and use it to insert the curve.
typename TopTraits::Default_point_location_strategy def_pl (arr);

View File

@ -132,9 +132,6 @@ void prepare_for_sweep (Arrangement& arr,
PointOutIter iso_points,
const ExTraits * /* ex_tr */)
{
typedef typename Arrangement::X_monotone_curve_2 X_monotone_curve_2;
typedef typename Arrangement::Point_2 Point_2;
typedef typename Arrangement::Vertex_iterator Vertex_iterator;
typedef typename Arrangement::Edge_iterator Edge_iterator;
typedef typename Arrangement::Vertex_handle Vertex_handle;

View File

@ -26,6 +26,7 @@
#include <iostream>
#include <vector>
#include <map>
#include <cstring>
#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
#include <CGAL/Arr_segment_traits_2.h>

View File

@ -48,7 +48,7 @@ if(OPENGL_FOUND)
use_essential_libs()
include_directories( ${CGAL_3RD_PARTY_INCLUDE_DIRS} ${CGAL_ImageIO_3RD_PARTY_INCLUDE_DIRS} )
include_directories( SYSTEM ${CGAL_3RD_PARTY_INCLUDE_DIRS} ${CGAL_ImageIO_3RD_PARTY_INCLUDE_DIRS} )
link_directories ( ${CGAL_LIBRARIES_DIR} ${CGAL_3RD_PARTY_LIBRARIES_DIRS} )

View File

@ -154,7 +154,6 @@ public:
std::istream &
operator>>(std::istream & is, Circular_arc_point_2<CK> &p)
{
typedef typename CK::Root_of_2 Root_of_2;
typedef typename CK::Root_for_circles_2_2 Root_for_circles_2_2;
Root_for_circles_2_2 r;

View File

@ -68,8 +68,6 @@ namespace CircularFunctors {
typename CK::Polynomial_for_circles_2_2
get_equation( const typename CK::Circle_2 & c )
{
typedef typename CK::RT RT;
typedef typename CK::Algebraic_kernel AK;
return AK().construct_polynomial_for_circles_2_2_object()

View File

@ -227,11 +227,11 @@ namespace CircularFunctors {
//CGAL_kernel_precondition (A1.is_x_monotone());
//CGAL_kernel_precondition (A2.is_x_monotone());
#ifdef CGAL_INTERSECTION_MAP_FOR_XMONOTONIC_ARC_WITH_SAME_SUPPORTING_CIRCLE
// intersection found on the map
typedef std::vector<CGAL::Object> solutions_container;
typedef typename CK::Circular_arc_2 Circular_arc_2;
#ifdef CGAL_INTERSECTION_MAP_FOR_XMONOTONIC_ARC_WITH_SAME_SUPPORTING_CIRCLE
// intersection found on the map
solutions_container early_sols;
if(Circular_arc_2::template find_intersection< solutions_container >
(A1,A2,early_sols)) {
@ -1057,9 +1057,6 @@ template < class CK, class OutputIterator >
OutputIterator res )
{
typedef typename CK::Circular_arc_2 Circular_arc_2;
typedef typename CK::Circle_2 Circle_2;
typedef typename CK::FT FT;
typedef typename CK::Point_2 Point_2;
typedef typename CK::Circular_arc_point_2 Circular_arc_point_2;
typedef typename CK::Root_for_circles_2_2 Root_for_circles_2_2;
@ -1320,9 +1317,6 @@ template < class CK, class OutputIterator >
OutputIterator res )
{
typedef typename CK::Circular_arc_2 Circular_arc_2;
typedef typename CK::Circle_2 Circle_2;
typedef typename CK::FT FT;
typedef typename CK::Point_2 Point_2;
typedef std::pair<CGAL::Object,bool > S_pair;
@ -1541,8 +1535,6 @@ advanced_make_xy_monotone( const typename CK::Circular_arc_2 &a,
CGAL::Bbox_2 circular_arc_bbox
( const typename CK::Kernel_base::Circular_arc_2 & a)
{
typedef typename CK::Root_of_2 Root_of_2;
typedef typename CK::FT FT;
typedef CGAL::Interval_nt<false>::Protector IntervalProtector;
typedef CGAL::Interval_nt<false> Interval;

View File

@ -33,8 +33,6 @@ namespace LinearFunctors {
typename CK::Polynomial_1_2
get_equation( const typename CK::Line_2 & L )
{
typedef typename CK::RT RT;
return typename CK::Polynomial_1_2(L.a(),L.b(),L.c());
}

View File

@ -157,7 +157,6 @@ namespace CircularFunctors {
if(A2.supporting_line().is_vertical())
return CGAL::SMALLER;
typedef typename CK::Circular_arc_point_2 Circular_arc_point_2;
typedef typename CK::Polynomial_1_2 Polynomial_1_2;
typedef typename CK::Root_of_2 Root_of_2;
@ -418,8 +417,7 @@ namespace CircularFunctors {
typedef typename CK::Circular_arc_point_2 Circular_arc_point_2;
typedef typename CK::Line_arc_2 Line_arc_2;
typedef typename CK::Point_2 Point_2;
typedef typename CK::Root_of_2 Root_of_2;
typedef typename CK::Root_for_circles_2_2 Root_for_circles_2_2;
// typedef typename CK::Root_for_circles_2_2 Root_for_circles_2_2;
#ifdef CGAL_CK_EXPLOIT_IDENTITY
bool a1s_a2s = a1.source().equal_ref(a2.source());
@ -757,8 +755,6 @@ namespace CircularFunctors {
typedef typename CK::Line_arc_2 Line_arc_2;
typedef typename CK::Point_2 Point_2;
typedef typename CK::Line_2 Line_2;
typedef typename CK::Root_of_2 Root_of_2;
typedef typename CK::Root_for_circles_2_2 Root_for_circles_2_2;
if(LinearFunctors::non_oriented_equal<CK>(l, la.supporting_line())) {
*res++ = make_object(la);
@ -784,7 +780,6 @@ namespace CircularFunctors {
{
typedef typename CK::Circular_arc_2 Circular_arc_2;
typedef typename CK::Circular_arc_point_2 Circular_arc_point_2;
typedef typename CK::Line_2 Line_2;
typedef std::vector<CGAL::Object > solutions_container;
solutions_container solutions;

View File

@ -617,7 +617,6 @@ std::ostream& operator << ( std::ostream& os, const ConicHPA2<_PT,_DA>& c)
template< class _PT, class _DA>
std::istream& operator >> ( std::istream& is, ConicHPA2<_PT,_DA>& c)
{
typedef ConicHPA2<_PT,_DA> Conic;
typedef typename _DA::RT RT;
RT r, s, t, u, v, w;

View File

@ -37,17 +37,13 @@ template<typename Nef_polyhedron>
void convex_decomposition_3(Nef_polyhedron& N)
{
typedef typename Nef_polyhedron::SNC_structure SNC_structure;
typedef typename SNC_structure::Vertex_handle Vertex_handle;
typedef typename SNC_structure::Halfedge_handle Halfedge_handle;
typedef typename SNC_structure::SHalfedge_handle SHalfedge_handle;
typedef typename SNC_structure::SHalfedge_iterator SHalfedge_iterator;
typedef typename Nef_polyhedron::Point_3 Point_3;
typedef typename Nef_polyhedron::Vector_3 Vector_3;
typedef typename Nef_polyhedron::Sphere_point Sphere_point;
typedef typename Nef_polyhedron::FT FT;
typedef typename CGAL::Single_wall_creator<Nef_polyhedron> Single_wall;
typedef typename CGAL::Single_wall_creator2<Nef_polyhedron> Single_wall2;
typedef typename CGAL::YVertical_wall_builder<Nef_polyhedron> YVertical_wall_builder;
typedef typename CGAL::Reflex_vertex_searcher<Nef_polyhedron> Reflex_vertex_searcher;
typedef typename CGAL::Ray_hit_generator2<Nef_polyhedron> Ray_hit2;

View File

@ -41,7 +41,6 @@ ch_graham_andrew_scan( BidirectionalIterator first,
OutputIterator result,
const Traits& ch_traits)
{
typedef typename Traits::Less_xy_2 Less_xy;
typedef typename Traits::Point_2 Point_2;
typedef typename Traits::Left_turn_2 Left_turn;
@ -129,8 +128,6 @@ ch__ref_graham_andrew_scan( BidirectionalIterator first,
OutputIterator& result,
const Traits& ch_traits)
{
typedef typename Traits::Less_xy_2 Less_xy;
typedef typename Traits::Point_2 Point_2;
typedef typename Traits::Left_turn_2 Left_turn;
CGAL_ch_precondition_code(
@ -202,9 +199,7 @@ ch_graham_andrew( InputIterator first,
OutputIterator result,
const Traits& ch_traits)
{
typedef typename Traits::Less_xy_2 Less_xy;
typedef typename Traits::Point_2 Point_2;
typedef typename Traits::Left_turn_2 Left_turn;
typedef typename Traits::Equal_2 Equal_2;
Equal_2 equal_points = ch_traits.equal_2_object();
@ -250,9 +245,7 @@ ch_lower_hull_scan( InputIterator first,
OutputIterator result,
const Traits& ch_traits)
{
typedef typename Traits::Less_xy_2 Less_xy;
typedef typename Traits::Point_2 Point_2;
typedef typename Traits::Left_turn_2 Left_turn;
typedef typename Traits::Equal_2 Equal_2;
Equal_2 equal_points = ch_traits.equal_2_object();
@ -287,9 +280,7 @@ ch_upper_hull_scan( InputIterator first,
OutputIterator result,
const Traits& ch_traits)
{
typedef typename Traits::Less_xy_2 Less_xy;
typedef typename Traits::Point_2 Point_2;
typedef typename Traits::Left_turn_2 Left_turn;
typedef typename Traits::Equal_2 Equal_2;
Equal_2 equal_points = ch_traits.equal_2_object();

View File

@ -90,7 +90,6 @@ is_cw_strongly_convex_2( ForwardIterator first, ForwardIterator last,
const Traits& ch_traits)
{
typedef typename Traits::Less_xy_2 Less_xy;
typedef typename Traits::Left_turn_2 Left_turn;
typedef typename Traits::Equal_2 Equal_2;
Less_xy smaller_xy = ch_traits.less_xy_2_object();

View File

@ -475,7 +475,6 @@ ch_quickhull_3_scan(TDS_2& tds,
const Traits& traits)
{
typedef typename TDS_2::Edge Edge;
typedef typename TDS_2::Face_circulator Face_circulator;
typedef typename TDS_2::Face_handle Face_handle;
typedef typename TDS_2::Vertex_handle Vertex_handle;
typedef typename Traits::Point_3 Point_3;
@ -562,9 +561,7 @@ void non_coplanar_quickhull_3(std::list<typename Traits::Point_3>& points,
TDS_2& tds, const Traits& traits)
{
typedef typename Traits::Point_3 Point_3;
typedef typename Traits::Plane_3 Plane_3;
typedef typename TDS_2::Vertex_handle Vertex_handle;
typedef typename TDS_2::Face_handle Face_handle;
typedef typename TDS_2::Face_iterator Face_iterator;
typedef typename std::list<Point_3>::iterator P3_iterator;
@ -639,8 +636,6 @@ public:
}
void operator()( HDS& hds) {
// Postcondition: `hds' is a valid polyhedral surface.
typedef typename HDS::Vertex Vertex;
typedef typename Vertex::Point Point;
CGAL::Polyhedron_incremental_builder_3<HDS> B( hds, true);
Vertex_map vertex_map;
@ -755,7 +750,6 @@ convex_hull_3(InputIterator first, InputIterator beyond,
Object& ch_object, const Traits& traits)
{
typedef typename Traits::Point_3 Point_3;
typedef typename Traits::Plane_3 Plane_3;
typedef std::list<Point_3> Point_3_list;
typedef typename Point_3_list::iterator P3_iterator;
typedef std::pair<P3_iterator,P3_iterator> P3_iterator_pair;
@ -868,7 +862,6 @@ void convex_hull_3(InputIterator first, InputIterator beyond,
Object& ch_object)
{
typedef typename std::iterator_traits<InputIterator>::value_type Point_3;
typedef typename Kernel_traits<Point_3>::Kernel K;
typedef typename internal::Convex_hull_3::Default_traits_for_Chull_3<Point_3>::type Traits;
convex_hull_3(first, beyond, ch_object, Traits());
}
@ -880,7 +873,6 @@ void convex_hull_3(InputIterator first, InputIterator beyond,
Polyhedron_3& polyhedron, const Traits& traits)
{
typedef typename Traits::Point_3 Point_3;
typedef typename Traits::Plane_3 Plane_3;
typedef std::list<Point_3> Point_3_list;
typedef typename Point_3_list::iterator P3_iterator;

View File

@ -2,7 +2,7 @@ message("Configuring libCGAL_Core")
use_essential_libs()
include_directories (${CGAL_3RD_PARTY_INCLUDE_DIRS})
include_directories (SYSTEM ${CGAL_3RD_PARTY_INCLUDE_DIRS})
add_definitions(${CGAL_3RD_PARTY_DEFINITIONS})

View File

@ -31,9 +31,6 @@ Object plane_half_plane_proj_intersection(const typename K::Plane_3 &h1,
const typename K::Line_2 &l,
const K& k)
{
typedef typename K::Vector_2 Vector_2;
typedef typename K::Point_2 Point_2;
typedef typename K::Ray_2 Ray_2;
typedef typename K::Line_3 Line_3;
typedef typename K::Line_2 Line_2;
typedef typename K::Plane_3 Plane_3;
@ -92,7 +89,6 @@ typename K::Line_2 project_xy(const typename K::Line_3& l,
typedef typename K::Vector_2 Vector_2;
typedef typename K::Point_3 Point_3;
typedef typename K::Point_2 Point_2;
typedef typename K::Ray_2 Ray_2;
Vector_3 vec3 = k.construct_vector_3_object()(l);
Vector_2 vec2(vec3.x(), vec3.y());
@ -157,10 +153,8 @@ Object ray_under_linear_constraint(const typename K::Ray_2& ray,
const K& k)
{
typedef typename K::Ray_2 Ray_2;
typedef typename K::Line_2 Line_2;
typedef typename K::Vector_2 Vector_2;
typedef typename K::Point_2 Point_2;
typedef typename K::Segment_2 Segment_2;
const Point_2& s = k.construct_point_on_2_object()(ray, 0);
Oriented_side side = k.oriented_side_2_object()(l, s);

View File

@ -47,7 +47,6 @@ OutputIterator random_polygon_2(std::size_t n, OutputIterator result,
{
typedef typename Traits::Point_2 Point_2;
typedef std::vector<Point_2> Vertex_list;
typedef typename Vertex_list::iterator Iterator;
Vertex_list vertices;

View File

@ -58,8 +58,6 @@ if ( CGAL_FOUND AND CGAL_Qt4_FOUND AND QT4_FOUND )
# And with CGAL libraries
target_link_libraries( Polygon_2 ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} )
add_dependencies( Polygon_2 ${CGAL_LIBRARY} )
else()
message(STATUS "NOTICE: This demo requires CGAL, CGAL_Core, and Qt4, and will not be compiled.")

View File

@ -59,7 +59,7 @@ if( QT4_FOUND )
use_essential_libs()
include_directories( ${CGAL_3RD_PARTY_INCLUDE_DIRS} ${CGAL_Qt4_3RD_PARTY_INCLUDE_DIRS} )
include_directories( SYSTEM ${CGAL_3RD_PARTY_INCLUDE_DIRS} ${CGAL_Qt4_3RD_PARTY_INCLUDE_DIRS} )
link_directories ( ${CGAL_LIBRARIES_DIR} ${CGAL_3RD_PARTY_LIBRARIES_DIRS} )

View File

@ -739,7 +739,6 @@ namespace HomogeneousKernelFunctors {
result_type
operator()(const Line_2& l1, const Line_2& l2) const
{
typedef typename K::RT RT;
if (l1.is_horizontal())
return l2.is_vertical() ?
SMALLER : CGAL_NTS sign(l2.a()) * CGAL_NTS sign(l2.b());
@ -1047,7 +1046,6 @@ namespace HomogeneousKernelFunctors {
result_type
operator()( const Point_2& p, const Line_2& h) const
{
typedef typename K::RT RT;
CGAL_kernel_precondition( ! h.is_vertical() );
typename K::Oriented_side ors = h.oriented_side( p );
if ( h.b() < 0 )

View File

@ -26,6 +26,13 @@ Release date:
by the free function convex_hull_2 when forward iterators are provided as
input).
* 2D Arrangements
- Improved the implementation of the incremental randomized
trapezoidal decomposition point-location strategy. The new
implementation enables point location in unbounded arrangements. It
constructs a search structure of guaranteed linear size with
guaranteed logarithmic query time.
* Combinatorial Maps

View File

@ -110,12 +110,22 @@ David A. Wheeler's 'SLOCCount'</a>, restricted to the <code>include/CGAL/</code>
<h3>Installation</h3>
<ul>
<li>CGAL-4.1 no longer supports the Intel Compiler version 11.0. The Intel
Compiler version 12.0 is supported instead.</li>
Compiler version 12.1 is supported instead.</li>
<li>Improved configuration for essential and optional external third party software</li>
<li>Added more general script to create CMakeLists.txt files: <tt>cgal_create_CMakeLists</tt></li>
<li>Availability tests for C++11 features are now performed with the help of <a href="http://www.boost.org/libs/config">Boost.Config</a>. A Boost version of 1.40.0 or higher is needed to use C++11 features.</li>
</ul>
<h3>2D Arrangement</h3>
<ul>
<li>Improved the implementation of the incremental randomized
trapezoidal decomposition point-location strategy. The new
implementation enables point location in unbounded arrangements. It
constructs a search structure of guaranteed linear size with
guaranteed logarithmic query time.
</li>
</ul>
<h3>2D Convex Hulls and Extreme Points </h3>
<ul>
<li>Speed up the preprocessing stage of the Akl-Toussaint implementation (used by the free function <code>convex_hull_2</code> when forward iterators are provided as input).</li>

View File

@ -1,20 +1,20 @@
function(create_single_source_cgal_program first )
function(create_single_source_cgal_program firstfile )
set(file "${first}")
if(NOT IS_ABSOLUTE "${file}")
set(file "${CMAKE_CURRENT_SOURCE_DIR}/${first}")
if(NOT IS_ABSOLUTE "${firstfile}")
set(file "${CMAKE_CURRENT_SOURCE_DIR}/${firstfile}")
endif()
if(EXISTS "${file}")
if(EXISTS "${firstfile}")
set( all "${file}" )
set( all "${firstfile}" )
# remaining files
foreach( i ${ARGN} )
set( all ${all} ${CMAKE_CURRENT_SOURCE_DIR}/${i} )
endforeach()
get_filename_component(exe_name ${first} NAME_WE)
get_filename_component(exe_name ${firstfile} NAME_WE)
add_executable(${exe_name} ${all})
add_to_cached_list( CGAL_EXECUTABLE_TARGETS ${exe_name} )

View File

@ -1,14 +1,15 @@
macro(create_single_source_cgal_program_qt4 first )
macro(create_single_source_cgal_program_qt4 firstfile )
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${first})
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${firstfile})
set( all ${CMAKE_CURRENT_SOURCE_DIR}/${first} )
set( all ${CMAKE_CURRENT_SOURCE_DIR}/${firstfile} )
# remaining files
foreach( i ${ARGN} )
set( all ${all} ${CMAKE_CURRENT_SOURCE_DIR}/${i} )
endforeach()
get_filename_component(exe_name ${first} NAME_WE)
get_filename_component(exe_name ${firstfile} NAME_WE)
# UI files (Qt Designer files)
qt4_wrap_ui( DT_UI_FILES ${exe_name}.ui )

View File

@ -227,7 +227,7 @@ if( NOT CGAL_MACROS_FILE_INCLUDED )
else()
####message( STATUS "${lib} include: ${${vlib}_INCLUDE_DIR}" )
include_directories ( ${${vlib}_INCLUDE_DIR} )
include_directories ( SYSTEM ${${vlib}_INCLUDE_DIR} )
# TODO EBEB remove definitions?
####message( STATUS "${lib} definitions: ${${vlib}_DEFINITIONS}" )
@ -350,12 +350,27 @@ if( NOT CGAL_MACROS_FILE_INCLUDED )
# - or even less specific if order becomes less relevant
# Eric Berberich 2012/06/29
if(RS_FOUND)
use_component( RS )
endif()
if(MPFI_FOUND)
use_component( MPFI )
endif()
use_component( MPFR )
if (GMPXX_FOUND)
use_component( GMPXX )
endif()
use_component( GMP )
if(LEDA_FOUND)
use_component( LEDA )
endif()
if(NTL_FOUND)
use_component( NTL )
endif()
endmacro()

View File

@ -5,7 +5,7 @@ if ( BLAS_FOUND AND NOT BLAS_SETUP )
message( STATUS "UseBLAS" )
message( STATUS "BLAS include: ${BLAS_INCLUDE_DIR}" )
include_directories ( ${BLAS_INCLUDE_DIR} )
include_directories ( SYSTEM ${BLAS_INCLUDE_DIR} )
message( STATUS "BLAS definitions: ${BLAS_DEFINITIONS}" )
add_definitions( ${BLAS_DEFINITIONS} )

View File

@ -5,7 +5,7 @@ if ( LAPACK_FOUND AND NOT LAPACK_SETUP )
message( STATUS "UseLAPACK" )
message( STATUS "LAPACK include: ${LAPACK_INCLUDE_DIR}" )
include_directories ( ${LAPACK_INCLUDE_DIR} )
include_directories ( SYSTEM ${LAPACK_INCLUDE_DIR} )
message( STATUS "LAPACK definitions: ${LAPACK_DEFINITIONS}" )
add_definitions( ${LAPACK_DEFINITIONS} )

View File

@ -5,7 +5,7 @@ if ( LEDA_FOUND AND NOT LEDA_SETUP )
message( STATUS "UseLEDA" )
message( STATUS "LEDA include: ${LEDA_INCLUDE_DIR}" )
include_directories ( ${LEDA_INCLUDE_DIR} )
include_directories ( SYSTEM ${LEDA_INCLUDE_DIR} )
message( STATUS "LEDA definitions: ${LEDA_DEFINITIONS}" )
add_definitions( ${LEDA_DEFINITIONS} )

View File

@ -4,7 +4,7 @@
if ( MKL_FOUND AND NOT CGAL_MKL_SETUP )
message( STATUS "MKL include: ${MKL_INCLUDE_DIR}" )
include_directories ( ${MKL_INCLUDE_DIR} )
include_directories ( SYSTEM ${MKL_INCLUDE_DIR} )
message( STATUS "MKL definitions: ${MKL_DEFINITIONS}" )
add_definitions( ${MKL_DEFINITIONS} )

View File

@ -7,8 +7,8 @@ if( MPFI_FOUND AND NOT MPFI_SETUP )
message( STATUS "UseMPFI" )
message( STATUS "MPFI include: ${MPFI_INCLUDE_DIR}" )
message( STATUS "MPFI libraries: ${MPFI_LIBRARIES}" )
message( STATUS "MPFI definitions: ${MPFI_DEFINITIONS}" )
message( STATUS "MPFI libraries: ${MPFI_LIBRARIES}" )
try_run( MPFI_TEST_RESULT
COMPILED_MPFI_TEST
@ -25,7 +25,7 @@ if( MPFI_FOUND AND NOT MPFI_SETUP )
)
if( COMPILED_MPFI_TEST AND MPFI_TEST_RESULT EQUAL 0)
include_directories( ${MPFI_INCLUDE_DIR} )
include_directories( SYSTEM ${MPFI_INCLUDE_DIR} )
link_directories( ${MPFI_LIBRARIES_DIR} )
add_definitions( ${MPFI_DEFINITIONS} "-DCGAL_USE_MPFI" )
link_libraries( ${MPFI_LIBRARIES} )

View File

@ -21,7 +21,7 @@ if( RS_FOUND AND NOT RS_SETUP )
endif( IS_OLD_GXX )
endif( APPLE AND CMAKE_COMPILER_IS_GNUCXX )
include_directories ( ${RS_INCLUDE_DIR} )
include_directories ( SYSTEM ${RS_INCLUDE_DIR} )
add_definitions( ${RS_DEFINITIONS} "-DCGAL_USE_RS" )
link_libraries( ${RS_LIBRARIES} )

View File

@ -11,7 +11,7 @@ if( RS3_FOUND AND NOT RS3_SETUP )
message( STATUS "RS3 definitions: ${RS3_DEFINITIONS}" )
message( STATUS "RS3 libraries: ${RS3_LIBRARIES}" )
include_directories ( ${RS3_INCLUDE_DIR} )
include_directories ( SYSTEM ${RS3_INCLUDE_DIR} )
add_definitions( ${RS3_DEFINITIONS} "-DCGAL_USE_RS3" )
link_libraries( ${RS3_LIBRARIES} )
@ -40,6 +40,8 @@ if( RS3_FOUND AND NOT RS3_SETUP )
message( STATUS "Using old RS signatures" )
endif( RS3_OLD_INCLUDES )
include(CGAL_UseMPFI)
set (RS3_SETUP TRUE)
endif( RS3_FOUND AND NOT RS3_SETUP )

View File

@ -5,7 +5,7 @@ if ( TAUCS_FOUND AND NOT TAUCS_SETUP )
message( STATUS "UseTAUCS" )
message( STATUS "TAUCS include: ${TAUCS_INCLUDE_DIR}" )
include_directories ( ${TAUCS_INCLUDE_DIR} )
include_directories ( SYSTEM ${TAUCS_INCLUDE_DIR} )
message( STATUS "TAUCS definitions: ${TAUCS_DEFINITIONS}" )
add_definitions( ${TAUCS_DEFINITIONS} "-DCGAL_USE_TAUCS" )

View File

@ -78,12 +78,6 @@ if ( CGAL_DIR )
set( CGAL_FOUND TRUE )
endif()
find_library(CGAL_Qt4_LIBRARY CGAL_Qt4 ${CGAL_DIR}/lib})
if (CGAL_Qt4_LIBRARY)
set( CGAL_Qt4_FOUND TRUE )
endif()
endif()
if( NOT CGAL_FOUND)

View File

@ -1,8 +1,9 @@
# Try to find the GMP libraries
# - Try to find the GMP libraries
# This module defines:
# GMP_FOUND - system has GMP lib
# GMP_INCLUDE_DIR - the GMP include directory
# GMP_LIBRARIES_DIR - Directory where the GMP libraries are located
# GMP_LIBRARIES - the GMP libraries
# GMP_LIBRARIES_DIR - directory where the GMP libraries are located
# GMP_LIBRARIES - Link these to use GMP
# GMP_IN_CGAL_AUXILIARY - TRUE if the GMP found is the one distributed with CGAL in the auxiliary folder
# TODO: support MacOSX

View File

@ -1,4 +1,5 @@
# Try to find the GMPXX libraries
# - Try to find the GMPXX libraries
# This module defines:
# GMPXX_FOUND - system has GMPXX lib
# GMPXX_INCLUDE_DIR - the GMPXX include directory
# GMPXX_LIBRARIES - Libraries needed to use GMPXX

View File

@ -12,7 +12,6 @@ endif()
if( MPFI_FOUND )
include( CGAL_VersionUtils )
include( ${MPFI_USE_FILE} )
find_path(RS_INCLUDE_DIR
NAMES rs_exports.h

View File

@ -9,8 +9,6 @@ if ( RS_FOUND )
if( MPFI_FOUND )
include( ${MPFI_USE_FILE} )
include( ${RS_USE_FILE} )
include( CGAL_VersionUtils )
find_path(RS3_INCLUDE_DIR
@ -68,9 +66,9 @@ else( MPFI_FOUND )
endif( MPFI_FOUND )
else( RS3_FOUND )
else( RS_FOUND )
message( STATUS "RS3 requires MPFI" )
message( STATUS "RS3 requires RS" )
set( RS3_FOUND FALSE )
endif( RS_FOUND )

View File

@ -38,7 +38,8 @@ if(NOT USE_CGAL_FILE_INCLUDED)
#message (STATUS "LIB: ${CGAL_LIBRARY}")
#message (STATUS "LIBS: ${CGAL_LIBRARIES}")
include_directories ( ${CGAL_INCLUDE_DIRS} ${CGAL_3RD_PARTY_INCLUDE_DIRS} )
include_directories ( ${CGAL_INCLUDE_DIRS})
include_directories ( SYSTEM ${CGAL_3RD_PARTY_INCLUDE_DIRS} )
add_definitions ( ${CGAL_3RD_PARTY_DEFINITIONS} ${CGAL_DEFINITIONS} )
link_directories ( ${CGAL_LIBRARIES_DIR} ${CGAL_3RD_PARTY_LIBRARIES_DIRS} )

View File

@ -1,4 +1,4 @@
# This module setups the compiler for using ESBTL library.
# It assumes that find_package(ESBTL) was already called.
include_directories( ${ESBTL_INCLUDE_DIR} )
include_directories( SYSTEM ${ESBTL_INCLUDE_DIR} )

View File

@ -2,7 +2,7 @@
# It assumes that find_package(Eigen3) was already called.
include_directories( ${EIGEN3_INCLUDE_DIR} )
include_directories( SYSTEM ${EIGEN3_INCLUDE_DIR} )
add_definitions(-DCGAL_EIGEN3_ENABLED)

View File

@ -2,7 +2,7 @@ message("Configuring libCGAL")
use_essential_libs()
include_directories (${CGAL_3RD_PARTY_INCLUDE_DIRS})
include_directories (SYSTEM ${CGAL_3RD_PARTY_INCLUDE_DIRS})
add_definitions(${CGAL_3RD_PARTY_DEFINITIONS})

View File

@ -84,7 +84,6 @@ protected:
{
//std::cout << "Drawing del\n";
typedef typename Kinetic_Delaunay::Triangulation Del;
typedef typename Del::Geom_traits::Point_2 Point_key;
const Del &tri= kdel_->triangulation(typename Del::Geom_traits::Time(t));
//tri.geom_traits().set_time(typename Del::Geom_traits::Time(t));
w << CGAL::LineWidth(1);

View File

@ -170,7 +170,6 @@ template <class T, class G>
void Qt_moving_points_2<T,G>::draw() const
{
//std::cout << "Drawing mpt MPT\n";
typedef typename Traits::Static_kernel::Point_2 P2;
typedef typename Traits::Static_kernel::Circle_2 C;
typedef typename Traits::Kinetic_kernel::Is_constant IC;
IC ic = traits_.kinetic_kernel_object().is_constant_object();
@ -191,6 +190,7 @@ void Qt_moving_points_2<T,G>::draw() const
} else {
w << CGAL::PointSize(std::max BOOST_PREVENT_MACRO_SUBSTITUTION(ptsz_/8, 1)) << CGAL::LineWidth(1);
}
// typedef typename Traits::Static_kernel::Point_2 P2;
//out << C(P2(0,0), 2) << C(P2(0,0), 1);
//out << CGAL::BackgroundColor(CGAL::Color(125,125,125));

View File

@ -22,9 +22,9 @@
# "next" alone
0 21 * * Sat cd $HOME/CGAL/create_internal_release && $HOME/bin/create_release $HOME/CGAL/next --public --do-it
0 21 * * Mon,Tue,Wed,Thu,Fri,Sat cd $HOME/CGAL/create_internal_release && $HOME/bin/create_release $HOME/CGAL/next --public --do-it
# "next" + candidates
0 21 * * Mon,Tue,Wed,Thu,Fri cd $HOME/CGAL/create_internal_release && $HOME/bin/create_release $HOME/CGAL/next $HOME/CGAL/candidate-packages --public --do-it
#0 21 * * Mon,Tue,Wed,Thu,Fri cd $HOME/CGAL/create_internal_release && $HOME/bin/create_release $HOME/CGAL/next $HOME/CGAL/candidate-packages --public --do-it
# - from branch 4.0
0 21 * * Sun cd $HOME/CGAL/create_internal_release-4.0-branch && $HOME/bin/create_release $HOME/CGAL/CGAL-4.0-branch --public --do-it

View File

@ -3,7 +3,6 @@
CGAL_TESTER="lrineau"
CGAL_TESTER_NAME="GeometryFactory"
CGAL_TESTER_ADDRESS=Laurent.Rineau__cgal_testsuite@normalesup.org
CGAL_ROOT=$HOME/CGAL/
MYSHELL="/bin/sh -c"
LC_ALL=C
@ -11,17 +10,17 @@ BUILD_HOSTS="localhost"
PROCESSORS_localhost=6
CGAL_ROOT=$HOME/CGAL
CGAL_ROOT=/no-raid$HOME/CGAL
LOGS_DIR="${CGAL_ROOT}/AUTOTEST_LOGS"
LOCK_FILE="${CGAL_ROOT}/autotest_cgal_with_cmake.lock"
#COMPILERS_localhost="i686_Linux-2.6_g++-4.1.2_CentOS-5.1-cmake"
#COMPILERS_localhost=essai
#COMPILERS_localhost="x86-64_Linux-2.6_g++-4.4.4_F13 x86-64_Linux-2.6_g++-4.4.0_Release-F13 x86-64_Linux-2.6_IntelCompiler-11.0-with-g++-4.4.0_F13 x86-64_Linux-2.6_IntelCompiler-11.1-with-g++-4.4.1_F13 x86-64_Linux-2.6_g++-4.4.1_F13-ansi x86-64_Linux-2.6_IntelCompiler-11.1-with-g++-4.4.1_F13-strict-ansi x86-64_Linux-2.6_g++-4.5-branch_Release-F13 x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F13 x86-64_Linux-2.6_g++-trunk_CXX0X-F13 x86-64_Linux-2.6_llvm-clang-with-g++-4.4.1_F13 x86-64_Linux-2.6_g++-4.4.4_F13-MATCHING-BUG-6"
COMPILERS_localhost="x86-64_Linux-2.6_g++-4.6.2_F16 x86-64_Linux-2.6_g++-4.6.2_F16-ansi x86-64_Linux-2.6_g++-4.6.2_F16-m32 x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6 x86-64_Linux-2.6_g++-4.6.2_Release-F16 x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16 x86-64_Linux-2.6_g++-4.5-branch_Release-F16 x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16 x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi x86-64_Linux-2.6_g++-trunk_CXX0X-F16 x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16 x86-64_Linux-2.6_g++-4.6.2_F16-CXXDEBUG"
COMPILERS_localhost="x86-64_Linux-2.6_g++-4.6.2_F16 x86-64_Linux-2.6_g++-4.6.2_F16-ansi x86-64_Linux-2.6_g++-4.6.2_F16-m32 x86-64_Linux-2.6_g++-4.6.2_F16-MATCHING-BUG-6 x86-64_Linux-2.6_g++-4.6.2_Release-F16 x86-64_Linux-2.6_g++-4.5-branch_CXX0X-F16 x86-64_Linux-2.6_g++-4.5-branch_Release-F16 x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16 x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16-strict-ansi x86-64_Linux-2.6_g++-trunk_CXX0X-F16 x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16 x86-64_Linux-2.6_g++-4.6.2_F16-CXXDEBUG x86-64_Linux-2.6_IntelCompiler-13.0beta-with-g++-4.6.3-STL_F16"
BUILD_ON_localhost=all
REFERENCE_PLATFORMS_DIR=$HOME/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms
REFERENCE_PLATFORMS_DIR=$HOME/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms
USE_REFERENCE_PLATFORMS=yes

View File

@ -1,5 +1,5 @@
# This is the CMakeCache file.
# For build in directory: /home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16
# For build in directory: /home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16-strict-ansi
# It was generated by CMake: /usr/bin/cmake
# You can edit this file to change values found and used by cmake.
# If you do not want to change any of the values, simply exit the editor.
@ -26,6 +26,15 @@ Boost_INCLUDE_DIR:PATH=/home/lrineau/CGAL/boost/boost-release-branch
//Boost library directory
Boost_LIBRARY_DIRS:FILEPATH=/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib
//The Boost SYSTEM library
Boost_SYSTEM_LIBRARY:FILEPATH=/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_system-mt.so
//Boost system library (debug)
Boost_SYSTEM_LIBRARY_DEBUG:FILEPATH=/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_system-mt.so
//Boost system library (release)
Boost_SYSTEM_LIBRARY_RELEASE:FILEPATH=/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_system-mt.so
//The Boost THREAD library
Boost_THREAD_LIBRARY:FILEPATH=/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so
@ -35,8 +44,11 @@ Boost_THREAD_LIBRARY_DEBUG:FILEPATH=/home/lrineau/CGAL/boost/boost-release-branc
//Boost thread library (release)
Boost_THREAD_LIBRARY_RELEASE:FILEPATH=/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so
//Select to allow to use all preconfigured external libraries
CGAL_ALLOW_ALL_PRECONFIGURED_LIBS_COMPONENT:BOOL=OFF
//Value Computed by CMake
CGAL_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16
CGAL_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16-strict-ansi
//Link with static Boost libraries
CGAL_Boost_USE_STATIC_LIBS:BOOL=OFF
@ -45,19 +57,13 @@ CGAL_Boost_USE_STATIC_LIBS:BOOL=OFF
CGAL_CORE_PACKAGE_DIR:PATH=/home/lrineau/CGAL/CGAL-I
//User-defined flags
CGAL_CXX_FLAGS:STRING=-D__SIZEOF_LONG__=8 -D__SIZEOF_LONG_LONG__=8 -fp-model strict -DBOOST_NO_HASH -diag-disable 980 -w1 -O3
//Value Computed by CMake
CGAL_Core_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/src/Core
CGAL_CXX_FLAGS:STRING=-D__SIZEOF_LONG__=8 -D__SIZEOF_LONG_LONG__=8 -fp-model strict -strict-ansi -DBOOST_NO_HASH -diag-disable 980 -w1 -O3
//The CGAL_Core library
CGAL_Core_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/lib/libCGAL_Core.so
CGAL_Core_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16-strict-ansi/lib/libCGAL_Core.so
//Dependencies for the target
CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;
//Value Computed by CMake
CGAL_Core_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALCore
CGAL_Core_LIB_DEPENDS:STATIC=general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16-strict-ansi/lib/libCGAL.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_system-mt.so;
//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
@ -66,6 +72,9 @@ CGAL_Core_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALCore
// TRUE.
CGAL_DONT_OVERRIDE_CMAKE_FLAGS:BOOL=TRUE
//Select to allow to preconfiguration of external libraries
CGAL_ENABLE_PRECONFIG:BOOL=ON
//Directory containing the Installation package
CGAL_INSTALLATION_PACKAGE_DIR:PATH=/home/lrineau/CGAL/CGAL-I
@ -79,7 +88,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-I-217
CGAL_INSTALL_DOC_DIR:STRING=share/doc/CGAL-4.1-I-118
//The folder where CGAL header files will be installed, relative
// to CMAKE_INSTALL_PREFIX
@ -93,67 +102,39 @@ CGAL_INSTALL_LIB_DIR:STRING=lib
// relative to CMAKE_INSTALL_PREFIX
CGAL_INSTALL_MAN_DIR:STRING=share/man/man1
//Value Computed by CMake
CGAL_ImageIO_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/src/ImageIO
//The CGAL_ImageIO library
CGAL_ImageIO_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/lib/libCGAL_ImageIO.so
CGAL_ImageIO_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16-strict-ansi/lib/libCGAL_ImageIO.so
//Dependencies for the target
CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so;
//Value Computed by CMake
CGAL_ImageIO_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALImageIO
CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16-strict-ansi/lib/libCGAL.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_system-mt.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so;
//The CGAL library
CGAL_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/lib/libCGAL.so
CGAL_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16-strict-ansi/lib/libCGAL.so
//Dependencies for the target
CGAL_LIB_DEPENDS:STATIC=general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;
CGAL_LIB_DEPENDS:STATIC=general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_system-mt.so;
//Directory containing the Maintenance package
CGAL_MAINTENANCE_PACKAGE_DIR:PATH=/home/lrineau/CGAL/CGAL-I
//Value Computed by CMake
CGAL_Qt3_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/src/Qt3
//The CGAL_Qt3 library
CGAL_Qt3_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/lib/libCGAL_Qt3.so
CGAL_Qt3_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16-strict-ansi/lib/libCGAL_Qt3.so
//Dependencies for the target
CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;
//Value Computed by CMake
CGAL_Qt3_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt3
//Value Computed by CMake
CGAL_Qt4_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/src/Qt4
CGAL_Qt3_LIB_DEPENDS:STATIC=general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16-strict-ansi/lib/libCGAL.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_system-mt.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;
//The CGAL_Qt4 library
CGAL_Qt4_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/lib/libCGAL_Qt4.so
CGAL_Qt4_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16-strict-ansi/lib/libCGAL_Qt4.so
//Dependencies for the target
CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;
//Value Computed by CMake
CGAL_Qt4_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt4
//soname-version
CGAL_SONAME_VERSION:STRING=7
CGAL_Qt4_LIB_DEPENDS:STATIC=general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16-strict-ansi/lib/libCGAL.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_system-mt.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;
//Value Computed by CMake
CGAL_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I
//soversion
CGAL_SOVERSION:STRING=7.0.0
//Path to a program.
CMAKE_AR:FILEPATH=/usr/bin/ar
//For backwards compatibility, what version of CMake commands and
// syntax should this version of CMake try to support.
CMAKE_BACKWARDS_COMPATIBILITY:STRING=2.4
//Build type: Release or Debug
CMAKE_BUILD_TYPE:STRING=Release
@ -161,10 +142,10 @@ CMAKE_BUILD_TYPE:STRING=Release
CMAKE_COLOR_MAKEFILE:BOOL=ON
//CXX compiler.
CMAKE_CXX_COMPILER:FILEPATH=/opt/intel/composerxe-2011.4.191/bin/intel64/icpc
CMAKE_CXX_COMPILER:FILEPATH=/opt/intel/composer_xe_2011_sp1.10.319/bin/intel64/icpc
//User-defined flags
CMAKE_CXX_FLAGS:STRING=-D__SIZEOF_LONG__=8 -D__SIZEOF_LONG_LONG__=8 -fp-model strict -DBOOST_NO_HASH -diag-disable 980 -diag-disable 11 -diag-disable 1292 -diag-disable 279 -diag-disable 2536 -w1 -O3
//Flags used by the compiler during all build types.
CMAKE_CXX_FLAGS:STRING='-I/home/lrineau/CGAL/boost/boost-release-branch/include -D__SIZEOF_LONG__=8 -D__SIZEOF_LONG_LONG__=8 -fp-model strict -strict-ansi -DBOOST_NO_HASH -diag-disable 980 -diag-disable 11 -diag-disable 1292 -diag-disable 279 -diag-disable 2536 -w1 -O3 '
//Flags used by the compiler during debug builds.
CMAKE_CXX_FLAGS_DEBUG:STRING=-g
@ -181,7 +162,7 @@ CMAKE_CXX_FLAGS_RELEASE:STRING=-O3
CMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING=-O2 -g
//C compiler.
CMAKE_C_COMPILER:FILEPATH=/opt/intel/composerxe-2011.4.191/bin/intel64/icc
CMAKE_C_COMPILER:FILEPATH=/opt/intel/composer_xe_2011_sp1.10.319/bin/intel64/icc
//Flags used by the compiler during all build types.
CMAKE_C_FLAGS:STRING=
@ -201,7 +182,7 @@ CMAKE_C_FLAGS_RELEASE:STRING=-O3 -DNDEBUG
CMAKE_C_FLAGS_RELWITHDEBINFO:STRING=-O2 -g
//Flags used by the linker.
CMAKE_EXE_LINKER_FLAGS:STRING=
CMAKE_EXE_LINKER_FLAGS:STRING=' '
//Flags used by the linker during debug builds.
CMAKE_EXE_LINKER_FLAGS_DEBUG:STRING=
@ -228,7 +209,7 @@ CMAKE_LINKER:FILEPATH=/usr/bin/ld
CMAKE_MAKE_PROGRAM:FILEPATH=/usr/bin/gmake
//Flags used by the linker during the creation of modules.
CMAKE_MODULE_LINKER_FLAGS:STRING=
CMAKE_MODULE_LINKER_FLAGS:STRING=' '
//Flags used by the linker during debug builds.
CMAKE_MODULE_LINKER_FLAGS_DEBUG:STRING=
@ -258,7 +239,7 @@ CMAKE_PROJECT_NAME:STATIC=CGAL
CMAKE_RANLIB:FILEPATH=/usr/bin/ranlib
//Flags used by the linker during the creation of dll's.
CMAKE_SHARED_LINKER_FLAGS:STRING=
CMAKE_SHARED_LINKER_FLAGS:STRING=' '
//Flags used by the linker during debug builds.
CMAKE_SHARED_LINKER_FLAGS_DEBUG:STRING=
@ -272,8 +253,12 @@ CMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING=
//Flags used by the linker during Release with Debug Info builds.
CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING=
//If set, runtime paths are not added when installing shared libraries,
// but are added when building.
CMAKE_SKIP_INSTALL_RPATH:BOOL=NO
//If set, runtime paths are not added when using shared libraries.
CMAKE_SKIP_RPATH:BOOL=OFF
CMAKE_SKIP_RPATH:BOOL=NO
//Path to a program.
CMAKE_STRIP:FILEPATH=/usr/bin/strip
@ -285,13 +270,7 @@ CMAKE_USE_RELATIVE_PATHS:BOOL=OFF
// .SILENT directive, and all commands will be echoed to the console
// during the make. This is useful for debugging only. With Visual
// Studio IDE projects all commands are done without /nologo.
CMAKE_VERBOSE_MAKEFILE:BOOL=OFF
//The directory containing the GMPXX include files
GMPXX_INCLUDE_DIR:PATH=/usr/include
//Path to the GMPXX library
GMPXX_LIBRARIES:FILEPATH=/usr/lib64/libgmpxx.so
CMAKE_VERBOSE_MAKEFILE:BOOL=FALSE
//The directory containing the GMP header files
GMP_INCLUDE_DIR:PATH=/usr/include
@ -630,7 +609,7 @@ QT_QTCLUCENE_LIBRARY_DEBUG:FILEPATH=/usr/lib64/libQtCLucene_debug.so
//Path to a library.
QT_QTCLUCENE_LIBRARY_RELEASE:FILEPATH=/usr/lib64/libQtCLucene.so
//(This variable does not exist and should not be used)
//Path to a file.
QT_QTCORE_INCLUDE_DIR:PATH=/usr/include/QtCore
//The Qt QTCORE library
@ -910,7 +889,7 @@ QT_QTXML_LIBRARY_RELEASE:FILEPATH=/usr/lib64/libQtXml.so
QT_QWEBVIEW_PLUGIN_DEBUG:FILEPATH=QT_QWEBVIEW_PLUGIN_DEBUG-NOTFOUND
//Path to a library.
QT_QWEBVIEW_PLUGIN_RELEASE:FILEPATH=/usr/lib64/qt4/plugins/designer/libqwebview.so
QT_QWEBVIEW_PLUGIN_RELEASE:FILEPATH=QT_QWEBVIEW_PLUGIN_RELEASE-NOTFOUND
//Path to a library.
QT_QWSTSLIBMOUSEHANDLER_PLUGIN_DEBUG:FILEPATH=QT_QWSTSLIBMOUSEHANDLER_PLUGIN_DEBUG-NOTFOUND
@ -942,6 +921,9 @@ QT_WORLDTIMECLOCKPLUGIN_PLUGIN_DEBUG:FILEPATH=QT_WORLDTIMECLOCKPLUGIN_PLUGIN_DEB
//Path to a library.
QT_WORLDTIMECLOCKPLUGIN_PLUGIN_RELEASE:FILEPATH=/usr/lib64/qt4/plugins/designer/libworldtimeclockplugin.so
//Select external library BLAS
WITH_BLAS:BOOL=OFF
//Enable CGAL component Core
WITH_CGAL_Core:BOOL=ON
@ -954,24 +936,60 @@ WITH_CGAL_Qt3:BOOL=ON
//Enable CGAL component Qt4
WITH_CGAL_Qt4:BOOL=ON
//Use the GMP number types if available.
//Select external library Coin3D
WITH_Coin3D:BOOL=OFF
//Select external library ESBTL
WITH_ESBTL:BOOL=OFF
//Select external library Eigen3
WITH_Eigen3:BOOL=OFF
//Select external library GMP
WITH_GMP:BOOL=ON
//Search for GMPXX
WITH_GMPXX:BOOL=ON
//Select external library GMPXX
WITH_GMPXX:BOOL=OFF
//Use the LEDA number types if available.
//Select external library IPE
WITH_IPE:BOOL=OFF
//Select external library LAPACK
WITH_LAPACK:BOOL=OFF
//Select external library LEDA
WITH_LEDA:BOOL=OFF
//Use MPFI if available.
//Select external library MPFI
WITH_MPFI:BOOL=OFF
//Use NTL if available.
//Select external library MPFR
WITH_MPFR:BOOL=ON
//Select external library NTL
WITH_NTL:BOOL=OFF
//Use RS if available.
//Select external library OpenGL
WITH_OpenGL:BOOL=OFF
//Select external library OpenNL
WITH_OpenNL:BOOL=OFF
//Select external library QGLViewer
WITH_QGLViewer:BOOL=OFF
//Select external library RS
WITH_RS:BOOL=OFF
//Select external library RS3
WITH_RS3:BOOL=OFF
//Select external library TAUCS
WITH_TAUCS:BOOL=OFF
//Select external library ZLIB
WITH_ZLIB:BOOL=OFF
//Select demos
WITH_demos:BOOL=OFF
@ -1000,7 +1018,7 @@ X11_X11_LIB:FILEPATH=/usr/lib64/libX11.so
X11_XRes_INCLUDE_PATH:PATH=/usr/include
//Path to a library.
X11_XRes_LIB:FILEPATH=X11_XRes_LIB-NOTFOUND
X11_XRes_LIB:FILEPATH=/usr/lib64/libXRes.so
//Path to a file.
X11_XShm_INCLUDE_PATH:PATH=/usr/include
@ -1090,7 +1108,7 @@ X11_Xkb_INCLUDE_PATH:PATH=/usr/include
X11_Xkbfile_INCLUDE_PATH:PATH=/usr/include
//Path to a library.
X11_Xkbfile_LIB:FILEPATH=X11_Xkbfile_LIB-NOTFOUND
X11_Xkbfile_LIB:FILEPATH=/usr/lib64/libxkbfile.so
//Path to a file.
X11_Xkblib_INCLUDE_PATH:PATH=/usr/include
@ -1098,6 +1116,12 @@ X11_Xkblib_INCLUDE_PATH:PATH=/usr/include
//Path to a file.
X11_Xlib_INCLUDE_PATH:PATH=/usr/include
//Path to a file.
X11_Xmu_INCLUDE_PATH:PATH=/usr/include
//Path to a library.
X11_Xmu_LIB:FILEPATH=/usr/lib64/libXmu.so
//Path to a file.
X11_Xpm_INCLUDE_PATH:PATH=/usr/include
@ -1143,6 +1167,9 @@ X11_Xv_LIB:FILEPATH=/usr/lib64/libXv.so
//Path to a library.
X11_Xxf86misc_LIB:FILEPATH=/usr/lib64/libXxf86misc.so
//Path to a library.
X11_Xxf86vm_LIB:FILEPATH=/usr/lib64/libXxf86vm.so
//Path to a file.
X11_dpms_INCLUDE_PATH:PATH=/usr/include
@ -1153,7 +1180,7 @@ X11_xf86misc_INCLUDE_PATH:PATH=/usr/include
X11_xf86vmode_INCLUDE_PATH:PATH=/usr/include
//Path to a program.
XIAR:FILEPATH=/opt/intel/composerxe-2011.4.191/bin/intel64/xiar
XIAR:FILEPATH=/opt/intel/composer_xe_2011_sp1.10.319/bin/intel64/xiar
//Path to a file.
ZLIB_INCLUDE_DIR:PATH=/usr/include
@ -1166,14 +1193,20 @@ ZLIB_LIBRARY:FILEPATH=/usr/lib64/libz.so
# INTERNAL cache entries
########################
//Name of all CGAL libraries.
ALL_CGAL_LIBRARIES:INTERNAL=CGAL;CGAL_Core;CGAL_ImageIO;CGAL_Qt3;CGAL_Qt4
//ADVANCED property for variable: Boost_INCLUDE_DIR
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_49
//Whether the Boost SYSTEM library found
Boost_SYSTEM_FOUND:INTERNAL=ON
//ADVANCED property for variable: Boost_SYSTEM_LIBRARY
Boost_SYSTEM_LIBRARY-ADVANCED:INTERNAL=1
//ADVANCED property for variable: Boost_SYSTEM_LIBRARY_DEBUG
Boost_SYSTEM_LIBRARY_DEBUG-ADVANCED:INTERNAL=1
//ADVANCED property for variable: Boost_SYSTEM_LIBRARY_RELEASE
Boost_SYSTEM_LIBRARY_RELEASE-ADVANCED:INTERNAL=1
//Whether the Boost THREAD library found
Boost_THREAD_FOUND:INTERNAL=ON
//ADVANCED property for variable: Boost_THREAD_LIBRARY
@ -1185,9 +1218,10 @@ Boost_THREAD_LIBRARY_RELEASE-ADVANCED:INTERNAL=1
//The version number for boost libraries
Boost_VERSION:INTERNAL=104900
CGAL_3RD_PARTY_DEFINITIONS:INTERNAL=
CGAL_3RD_PARTY_INCLUDE_DIRS:INTERNAL=/usr/include;/usr/include;/usr/include;/home/lrineau/CGAL/boost/boost-release-branch
CGAL_3RD_PARTY_LIBRARIES:INTERNAL=/usr/lib64/libgmpxx.so;/usr/lib64/libmpfr.so;/usr/lib64/libgmp.so;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so
CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=/usr/lib64;/usr/lib64;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib
CGAL_3RD_PARTY_INCLUDE_DIRS:INTERNAL=/home/lrineau/CGAL/boost/boost-release-branch
CGAL_3RD_PARTY_LIBRARIES:INTERNAL=/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_system-mt.so
CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib
CGAL_3RD_PARTY_PRECONFIGURED:INTERNAL=
//ADVANCED property for variable: CGAL_Boost_USE_STATIC_LIBS
CGAL_Boost_USE_STATIC_LIBS-ADVANCED:INTERNAL=1
CGAL_CFG_ARRAY_MEMBER_INITIALIZATION_BUG:INTERNAL=1
@ -1205,9 +1239,6 @@ CGAL_CFG_IEEE_754_BUG_COMPILED:INTERNAL=TRUE
CGAL_CFG_ISTREAM_INT_BUG:INTERNAL=0
//Result of TRY_COMPILE
CGAL_CFG_ISTREAM_INT_BUG_COMPILED:INTERNAL=TRUE
CGAL_CFG_LONGNAME_BUG:INTERNAL=0
//Result of TRY_COMPILE
CGAL_CFG_LONGNAME_BUG_COMPILED:INTERNAL=TRUE
CGAL_CFG_MATCHING_BUG_5:INTERNAL=0
//Result of TRY_COMPILE
CGAL_CFG_MATCHING_BUG_5_COMPILED:INTERNAL=TRUE
@ -1217,81 +1248,15 @@ CGAL_CFG_MATCHING_BUG_6_COMPILED:INTERNAL=TRUE
CGAL_CFG_NESTED_CLASS_FRIEND_DECLARATION_BUG:INTERNAL=1
//Result of TRY_COMPILE
CGAL_CFG_NESTED_CLASS_FRIEND_DECLARATION_BUG_COMPILED:INTERNAL=FALSE
CGAL_CFG_NO_CPP0X_ARRAY:INTERNAL=1
//Result of TRY_COMPILE
CGAL_CFG_NO_CPP0X_ARRAY_COMPILED:INTERNAL=FALSE
CGAL_CFG_NO_CPP0X_AUTO:INTERNAL=1
//Result of TRY_COMPILE
CGAL_CFG_NO_CPP0X_AUTO_COMPILED:INTERNAL=FALSE
CGAL_CFG_NO_CPP0X_COPY_N:INTERNAL=1
//Result of TRY_COMPILE
CGAL_CFG_NO_CPP0X_COPY_N_COMPILED:INTERNAL=FALSE
CGAL_CFG_NO_CPP0X_DECLTYPE:INTERNAL=1
//Result of TRY_COMPILE
CGAL_CFG_NO_CPP0X_DECLTYPE_COMPILED:INTERNAL=FALSE
CGAL_CFG_NO_CPP0X_DEFAULT_TEMPLATE_ARGUMENTS_FOR_FUNCTION_TEMPLATES:INTERNAL=1
//Result of TRY_COMPILE
CGAL_CFG_NO_CPP0X_DEFAULT_TEMPLATE_ARGUMENTS_FOR_FUNCTION_TEMPLATES_COMPILED:INTERNAL=FALSE
CGAL_CFG_NO_CPP0X_DELEGATING_CONSTRUCTORS:INTERNAL=1
//Result of TRY_COMPILE
CGAL_CFG_NO_CPP0X_DELEGATING_CONSTRUCTORS_COMPILED:INTERNAL=FALSE
CGAL_CFG_NO_CPP0X_DELETED_AND_DEFAULT_FUNCTIONS:INTERNAL=1
//Result of TRY_COMPILE
CGAL_CFG_NO_CPP0X_DELETED_AND_DEFAULT_FUNCTIONS_COMPILED:INTERNAL=FALSE
CGAL_CFG_NO_CPP0X_INITIALIZER_LISTS:INTERNAL=1
//Result of TRY_COMPILE
CGAL_CFG_NO_CPP0X_INITIALIZER_LISTS_COMPILED:INTERNAL=FALSE
CGAL_CFG_NO_CPP0X_ISFINITE:INTERNAL=0
//Result of TRY_COMPILE
CGAL_CFG_NO_CPP0X_ISFINITE_COMPILED:INTERNAL=TRUE
CGAL_CFG_NO_CPP0X_LAMBDAS:INTERNAL=1
//Result of TRY_COMPILE
CGAL_CFG_NO_CPP0X_LAMBDAS_COMPILED:INTERNAL=FALSE
CGAL_CFG_NO_CPP0X_LONG_LONG:INTERNAL=0
//Result of TRY_COMPILE
CGAL_CFG_NO_CPP0X_LONG_LONG_COMPILED:INTERNAL=TRUE
CGAL_CFG_NO_CPP0X_NEXT_PREV:INTERNAL=1
//Result of TRY_COMPILE
CGAL_CFG_NO_CPP0X_NEXT_PREV_COMPILED:INTERNAL=FALSE
CGAL_CFG_NO_CPP0X_RVALUE_REFERENCE:INTERNAL=1
//Result of TRY_COMPILE
CGAL_CFG_NO_CPP0X_RVALUE_REFERENCE_COMPILED:INTERNAL=FALSE
CGAL_CFG_NO_CPP0X_STATIC_ASSERT:INTERNAL=1
//Result of TRY_COMPILE
CGAL_CFG_NO_CPP0X_STATIC_ASSERT_COMPILED:INTERNAL=FALSE
CGAL_CFG_NO_CPP0X_TUPLE:INTERNAL=1
//Result of TRY_COMPILE
CGAL_CFG_NO_CPP0X_TUPLE_COMPILED:INTERNAL=FALSE
CGAL_CFG_NO_CPP0X_VARIADIC_TEMPLATES:INTERNAL=1
//Result of TRY_COMPILE
CGAL_CFG_NO_CPP0X_VARIADIC_TEMPLATES_COMPILED:INTERNAL=FALSE
CGAL_CFG_NO_LIMITS:INTERNAL=0
//Result of TRY_COMPILE
CGAL_CFG_NO_LIMITS_COMPILED:INTERNAL=TRUE
CGAL_CFG_NO_LOGICAL_OPERATORS_ALTERNATIVES:INTERNAL=0
//Result of TRY_COMPILE
CGAL_CFG_NO_LOGICAL_OPERATORS_ALTERNATIVES_COMPILED:INTERNAL=TRUE
CGAL_CFG_NO_MESSAGE_PRAGMA_BUG:INTERNAL=0
//Result of TRY_COMPILE
CGAL_CFG_NO_MESSAGE_PRAGMA_BUG_COMPILED:INTERNAL=TRUE
CGAL_CFG_NO_NEXTAFTER:INTERNAL=0
//Result of TRY_COMPILE
CGAL_CFG_NO_NEXTAFTER_COMPILED:INTERNAL=TRUE
CGAL_CFG_NO_STATEMENT_EXPRESSIONS:INTERNAL=1
//Result of TRY_COMPILE
CGAL_CFG_NO_STATEMENT_EXPRESSIONS_COMPILED:INTERNAL=FALSE
CGAL_CFG_NO_STL:INTERNAL=0
//Result of TRY_COMPILE
CGAL_CFG_NO_STL_COMPILED:INTERNAL=TRUE
CGAL_CFG_NO_TMPL_IN_TMPL_PARAM:INTERNAL=0
//Result of TRY_COMPILE
CGAL_CFG_NO_TMPL_IN_TMPL_PARAM_COMPILED:INTERNAL=TRUE
CGAL_CFG_NO_TR1_ARRAY:INTERNAL=0
//Result of TRY_COMPILE
CGAL_CFG_NO_TR1_ARRAY_COMPILED:INTERNAL=TRUE
CGAL_CFG_NO_TR1_TUPLE:INTERNAL=1
//Result of TRY_COMPILE
CGAL_CFG_NO_TR1_TUPLE_COMPILED:INTERNAL=FALSE
CGAL_CFG_NO_WARNING_CPP_DIRECTIVE_BUG:INTERNAL=0
//Result of TRY_COMPILE
CGAL_CFG_NO_WARNING_CPP_DIRECTIVE_BUG_COMPILED:INTERNAL=TRUE
@ -1311,7 +1276,7 @@ CGAL_CFG_USING_BASE_MEMBER_BUG_2:INTERNAL=0
//Result of TRY_COMPILE
CGAL_CFG_USING_BASE_MEMBER_BUG_2_COMPILED:INTERNAL=TRUE
//Variable hidden from user
CGAL_CGAL_LIBRARY:INTERNAL=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/lib/libCGAL.so
CGAL_CGAL_LIBRARY:INTERNAL=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16-strict-ansi/lib/libCGAL.so
//Variable hidden from user
CGAL_CGAL_LIBRARY_NAME:INTERNAL=libCGAL.so
CGAL_CONFIGURED_LIBRARIES:INTERNAL=CGAL;Core;ImageIO;Qt3;Qt4
@ -1323,7 +1288,47 @@ CGAL_Core_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=
CGAL_Core_LIBRARY-ADVANCED:INTERNAL=1
//Variable hidden from user
CGAL_Core_LIBRARY_NAME:INTERNAL=libCGAL_Core.so
//Variable hidden from user
CGAL_ESSENTIAL_3RD_PARTY_LIBRARIES:INTERNAL=GMP;MPFR;GMP;MPFR;GMP;MPFR
CGAL_EXECUTABLE_TARGETS:INTERNAL=
//Variable hidden from user
CGAL_EXT_LIB_BLAS_PREFIX:INTERNAL=BLAS
//Variable hidden from user
CGAL_EXT_LIB_Coin3D_PREFIX:INTERNAL=COIN3D
//Variable hidden from user
CGAL_EXT_LIB_ESBTL_PREFIX:INTERNAL=ESBTL
//Variable hidden from user
CGAL_EXT_LIB_Eigen3_PREFIX:INTERNAL=EIGEN3
//Variable hidden from user
CGAL_EXT_LIB_GMPXX_PREFIX:INTERNAL=GMPXX
//Variable hidden from user
CGAL_EXT_LIB_GMP_PREFIX:INTERNAL=GMP
//Variable hidden from user
CGAL_EXT_LIB_IPE_PREFIX:INTERNAL=IPE
//Variable hidden from user
CGAL_EXT_LIB_LAPACK_PREFIX:INTERNAL=LAPACK
//Variable hidden from user
CGAL_EXT_LIB_LEDA_PREFIX:INTERNAL=LEDA
//Variable hidden from user
CGAL_EXT_LIB_MPFI_PREFIX:INTERNAL=MPFI
//Variable hidden from user
CGAL_EXT_LIB_MPFR_PREFIX:INTERNAL=MPFR
//Variable hidden from user
CGAL_EXT_LIB_NTL_PREFIX:INTERNAL=NTL
//Variable hidden from user
CGAL_EXT_LIB_OpenGL_PREFIX:INTERNAL=OpenGL
//Variable hidden from user
CGAL_EXT_LIB_OpenNL_PREFIX:INTERNAL=OpenNL
//Variable hidden from user
CGAL_EXT_LIB_QGLViewer_PREFIX:INTERNAL=QGLVIEWER
//Variable hidden from user
CGAL_EXT_LIB_RS3_PREFIX:INTERNAL=RS3
//Variable hidden from user
CGAL_EXT_LIB_RS_PREFIX:INTERNAL=RS
//Variable hidden from user
CGAL_EXT_LIB_TAUCS_PREFIX:INTERNAL=TAUCS
//Variable hidden from user
CGAL_EXT_LIB_ZLIB_PREFIX:INTERNAL=ZLIB
CGAL_ImageIO_3RD_PARTY_DEFINITIONS:INTERNAL=-DCGAL_USE_ZLIB
CGAL_ImageIO_3RD_PARTY_INCLUDE_DIRS:INTERNAL=/usr/include;/usr/include
CGAL_ImageIO_3RD_PARTY_LIBRARIES:INTERNAL=/usr/lib64/libGLU.so;/usr/lib64/libGL.so;/usr/lib64/libSM.so;/usr/lib64/libICE.so;/usr/lib64/libX11.so;/usr/lib64/libXext.so;/usr/lib64/libz.so
@ -1353,26 +1358,22 @@ CGAL_Qt4_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=
CGAL_Qt4_LIBRARY-ADVANCED:INTERNAL=1
//Variable hidden from user
CGAL_Qt4_LIBRARY_NAME:INTERNAL=libCGAL_Qt4.so
//ADVANCED property for variable: CGAL_SONAME_VERSION
CGAL_SONAME_VERSION-ADVANCED:INTERNAL=1
//ADVANCED property for variable: CGAL_SOVERSION
CGAL_SOVERSION-ADVANCED:INTERNAL=1
//Variable hidden from user
CGAL_SUPPORTING_3RD_PARTY_LIBRARIES:INTERNAL=GMP;GMPXX;MPFR;ZLIB;OpenGL;LEDA;MPFI;RS;RS3;OpenNL;TAUCS;Eigen3;BLAS;LAPACK;QGLViewer;ESBTL;Coin3D;NTL;IPE
//ADVANCED property for variable: CMAKE_AR
CMAKE_AR-ADVANCED:INTERNAL=1
//ADVANCED property for variable: CMAKE_BACKWARDS_COMPATIBILITY
CMAKE_BACKWARDS_COMPATIBILITY-ADVANCED:INTERNAL=1
//ADVANCED property for variable: CMAKE_BUILD_TOOL
CMAKE_BUILD_TOOL-ADVANCED:INTERNAL=1
//What is the target build tool cmake is generating for.
CMAKE_BUILD_TOOL:INTERNAL=/usr/bin/gmake
//This is the directory where this CMakeCache.txt was created
CMAKE_CACHEFILE_DIR:INTERNAL=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16
CMAKE_CACHEFILE_DIR:INTERNAL=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16-strict-ansi
//Major version of cmake used to create the current loaded cache
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=7
CMAKE_CACHE_PATCH_VERSION:INTERNAL=8
//ADVANCED property for variable: CMAKE_COLOR_MAKEFILE
CMAKE_COLOR_MAKEFILE-ADVANCED:INTERNAL=1
//Path to CMake executable.
@ -1412,7 +1413,7 @@ CMAKE_DETERMINE_CXX_ABI_COMPILED:INTERNAL=TRUE
//Result of TRY_COMPILE
CMAKE_DETERMINE_C_ABI_COMPILED:INTERNAL=TRUE
//Path to cache edit program executable.
CMAKE_EDIT_COMMAND:INTERNAL=/usr/bin/cmake-gui
CMAKE_EDIT_COMMAND:INTERNAL=/usr/bin/ccmake
//Executable file format
CMAKE_EXECUTABLE_FORMAT:INTERNAL=ELF
//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS
@ -1433,11 +1434,13 @@ CMAKE_GENERATOR:INTERNAL=Unix Makefiles
CMAKE_HAVE_CONNECT:INTERNAL=1
//Have function gethostbyname
CMAKE_HAVE_GETHOSTBYNAME:INTERNAL=1
//Have symbol pthread_create
CMAKE_HAVE_LIBC_CREATE:INTERNAL=
//Have library pthreads
CMAKE_HAVE_PTHREADS_CREATE:INTERNAL=
//Have library pthread
CMAKE_HAVE_PTHREAD_CREATE:INTERNAL=1
//Have include CMAKE_HAVE_PTHREAD_H
//Have include pthread.h
CMAKE_HAVE_PTHREAD_H:INTERNAL=1
//Have function remove
CMAKE_HAVE_REMOVE:INTERNAL=1
@ -1486,28 +1489,31 @@ CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
CMAKE_SHARED_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO
CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
//ADVANCED property for variable: CMAKE_SKIP_INSTALL_RPATH
CMAKE_SKIP_INSTALL_RPATH-ADVANCED:INTERNAL=1
//ADVANCED property for variable: CMAKE_SKIP_RPATH
CMAKE_SKIP_RPATH-ADVANCED:INTERNAL=1
//ADVANCED property for variable: CMAKE_STRIP
CMAKE_STRIP-ADVANCED:INTERNAL=1
//Suppress Warnings that are meant for the author of the CMakeLists.txt
// files.
CMAKE_SUPPRESS_DEVELOPER_WARNINGS:INTERNAL=FALSE
//uname command
CMAKE_UNAME:INTERNAL=/bin/uname
//ADVANCED property for variable: CMAKE_USE_RELATIVE_PATHS
CMAKE_USE_RELATIVE_PATHS-ADVANCED:INTERNAL=1
//ADVANCED property for variable: CMAKE_VERBOSE_MAKEFILE
CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1
CONFIG_CXX_FLAGS:INTERNAL=-D__SIZEOF_LONG__=8 -D__SIZEOF_LONG_LONG__=8 -fp-model strict -DBOOST_NO_HASH -diag-disable 980 -diag-disable 11 -diag-disable 1292 -diag-disable 279 -diag-disable 2536 -w1 -O3
CONFIG_CXX_FLAGS:INTERNAL='-I/home/lrineau/CGAL/boost/boost-release-branch/include -D__SIZEOF_LONG__=8 -D__SIZEOF_LONG_LONG__=8 -fp-model strict -strict-ansi -DBOOST_NO_HASH -diag-disable 980 -diag-disable 11 -diag-disable 1292 -diag-disable 279 -diag-disable 2536 -w1 -O3 '
//Variable hidden from user
EXECUTABLE_OUTPUT_PATH:INTERNAL=
//Details about finding GMP
FIND_PACKAGE_MESSAGE_DETAILS_GMP:INTERNAL=[/usr/lib64/libgmp.so][/usr/include][v()]
//Details about finding MPFR
FIND_PACKAGE_MESSAGE_DETAILS_MPFR:INTERNAL=[/usr/lib64/libmpfr.so][/usr/include][v()]
//Details about finding OpenGL
FIND_PACKAGE_MESSAGE_DETAILS_OpenGL:INTERNAL=[/usr/lib64/libGL.so][v()]
//Details about finding Threads
FIND_PACKAGE_MESSAGE_DETAILS_Threads:INTERNAL=[TRUE][v()]
//Details about finding X11
FIND_PACKAGE_MESSAGE_DETAILS_X11:INTERNAL=[/usr/lib64/libX11.so][/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include]
FIND_PACKAGE_MESSAGE_DETAILS_X11:INTERNAL=[/usr/lib64/libX11.so][/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include]
//Details about finding ZLIB
FIND_PACKAGE_MESSAGE_DETAILS_ZLIB:INTERNAL=[/usr/lib64/libz.so][/usr/include][v1.2.5()]
//Result of TRY_COMPILE
@ -1519,7 +1525,7 @@ IntelCompiler_COMPILE_RES:INTERNAL=TRUE
//Result of TRY_RUN
IntelCompiler_RUN_RES:INTERNAL=0
//Variable hidden from user
LIBRARY_OUTPUT_PATH:INTERNAL=/home/lrineau/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/lib
LIBRARY_OUTPUT_PATH:INTERNAL=
//Result of TRY_COMPILE
MPFR_COMPILE_RES:INTERNAL=TRUE
//Result of TRY_RUN
@ -1971,18 +1977,6 @@ Q_WS_QWS:INTERNAL=
Q_WS_WIN:INTERNAL=
//Have symbol Q_WS_X11
Q_WS_X11:INTERNAL=1
//hide this
Qt_help_window_h:INTERNAL=/home/lrineau/CGAL/CGAL-I/include/CGAL/IO/Qt_help_window.h
//hide this
Qt_widget_OpenGL_h:INTERNAL=/home/lrineau/CGAL/CGAL-I/include/CGAL/IO/Qt_widget_OpenGL.h
//hide this
Qt_widget_h:INTERNAL=/home/lrineau/CGAL/CGAL-I/include/CGAL/IO/Qt_widget.h
//hide this
Qt_widget_history_h:INTERNAL=/home/lrineau/CGAL/CGAL-I/include/CGAL/IO/Qt_widget_history.h
//hide this
Qt_widget_layer_h:INTERNAL=/home/lrineau/CGAL/CGAL-I/include/CGAL/IO/Qt_widget_layer.h
//hide this
Qt_widget_standard_toolbar_h:INTERNAL=/home/lrineau/CGAL/CGAL-I/include/CGAL/IO/Qt_widget_standard_toolbar.h
//ADVANCED property for variable: X11_ICE_INCLUDE_PATH
X11_ICE_INCLUDE_PATH-ADVANCED:INTERNAL=1
//ADVANCED property for variable: X11_ICE_LIB
@ -2065,6 +2059,10 @@ X11_Xkbfile_LIB-ADVANCED:INTERNAL=1
X11_Xkblib_INCLUDE_PATH-ADVANCED:INTERNAL=1
//ADVANCED property for variable: X11_Xlib_INCLUDE_PATH
X11_Xlib_INCLUDE_PATH-ADVANCED:INTERNAL=1
//ADVANCED property for variable: X11_Xmu_INCLUDE_PATH
X11_Xmu_INCLUDE_PATH-ADVANCED:INTERNAL=1
//ADVANCED property for variable: X11_Xmu_LIB
X11_Xmu_LIB-ADVANCED:INTERNAL=1
//ADVANCED property for variable: X11_Xpm_INCLUDE_PATH
X11_Xpm_INCLUDE_PATH-ADVANCED:INTERNAL=1
//ADVANCED property for variable: X11_Xpm_LIB
@ -2095,6 +2093,8 @@ X11_Xv_INCLUDE_PATH-ADVANCED:INTERNAL=1
X11_Xv_LIB-ADVANCED:INTERNAL=1
//ADVANCED property for variable: X11_Xxf86misc_LIB
X11_Xxf86misc_LIB-ADVANCED:INTERNAL=1
//ADVANCED property for variable: X11_Xxf86vm_LIB
X11_Xxf86vm_LIB-ADVANCED:INTERNAL=1
//ADVANCED property for variable: X11_dpms_INCLUDE_PATH
X11_dpms_INCLUDE_PATH-ADVANCED:INTERNAL=1
//ADVANCED property for variable: X11_xf86misc_INCLUDE_PATH

View File

@ -0,0 +1,15 @@
source /opt/intel/composer_xe_2011_sp1/bin/compilervars.sh intel64
CXX=icpc
CC=icc
CXXFLAGS="-D__SIZEOF_LONG__=8 -D__SIZEOF_LONG_LONG__=8 -fp-model strict -strict-ansi -DBOOST_NO_HASH -diag-disable 980 -diag-disable 11 -diag-disable 1292 -diag-disable 279 -diag-disable 2536 -w1 -O3"
export CXX CC CXXFLAGS
export QTDIR=/usr/lib64/qt-3.3
source /home/lrineau/CGAL/MPFI-RS/setup-rs
source /home/lrineau/CGAL/CGAL-I-REF/cmake/platforms/setup-common
BOOST_INCLUDEDIR=/home/lrineau/CGAL/boost/boost-release-branch
BOOST_LIBRARYDIR=/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib
export BOOST_INCLUDEDIR BOOST_LIBRARYDIR
CXXFLAGS="-I$BOOST_INCLUDEDIR/include $CXXFLAGS"
export CXXFLAGS

View File

@ -1,5 +1,5 @@
# This is the CMakeCache file.
# For build in directory: /home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi
# For build in directory: /home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16
# It was generated by CMake: /usr/bin/cmake
# You can edit this file to change values found and used by cmake.
# If you do not want to change any of the values, simply exit the editor.
@ -26,6 +26,15 @@ Boost_INCLUDE_DIR:PATH=/home/lrineau/CGAL/boost/boost-release-branch
//Boost library directory
Boost_LIBRARY_DIRS:FILEPATH=/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib
//The Boost SYSTEM library
Boost_SYSTEM_LIBRARY:FILEPATH=/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_system-mt.so
//Boost system library (debug)
Boost_SYSTEM_LIBRARY_DEBUG:FILEPATH=/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_system-mt.so
//Boost system library (release)
Boost_SYSTEM_LIBRARY_RELEASE:FILEPATH=/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_system-mt.so
//The Boost THREAD library
Boost_THREAD_LIBRARY:FILEPATH=/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so
@ -35,8 +44,11 @@ Boost_THREAD_LIBRARY_DEBUG:FILEPATH=/home/lrineau/CGAL/boost/boost-release-branc
//Boost thread library (release)
Boost_THREAD_LIBRARY_RELEASE:FILEPATH=/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so
//Select to allow to use all preconfigured external libraries
CGAL_ALLOW_ALL_PRECONFIGURED_LIBS_COMPONENT:BOOL=OFF
//Value Computed by CMake
CGAL_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi
CGAL_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16
//Link with static Boost libraries
CGAL_Boost_USE_STATIC_LIBS:BOOL=OFF
@ -45,19 +57,13 @@ CGAL_Boost_USE_STATIC_LIBS:BOOL=OFF
CGAL_CORE_PACKAGE_DIR:PATH=/home/lrineau/CGAL/CGAL-I
//User-defined flags
CGAL_CXX_FLAGS:STRING=-D__SIZEOF_LONG__=8 -D__SIZEOF_LONG_LONG__=8 -fp-model strict -strict-ansi -DBOOST_NO_HASH -diag-disable 980 -w1 -O3
//Value Computed by CMake
CGAL_Core_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/src/Core
CGAL_CXX_FLAGS:STRING=-D__SIZEOF_LONG__=8 -D__SIZEOF_LONG_LONG__=8 -fp-model strict -DBOOST_NO_HASH -diag-disable 980 -w1 -O3
//The CGAL_Core library
CGAL_Core_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL_Core.so
CGAL_Core_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16/lib/libCGAL_Core.so
//Dependencies for the target
CGAL_Core_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;
//Value Computed by CMake
CGAL_Core_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALCore
CGAL_Core_LIB_DEPENDS:STATIC=general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16/lib/libCGAL.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_system-mt.so;
//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
@ -66,6 +72,9 @@ CGAL_Core_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALCore
// TRUE.
CGAL_DONT_OVERRIDE_CMAKE_FLAGS:BOOL=TRUE
//Select to allow to preconfiguration of external libraries
CGAL_ENABLE_PRECONFIG:BOOL=ON
//Directory containing the Installation package
CGAL_INSTALLATION_PACKAGE_DIR:PATH=/home/lrineau/CGAL/CGAL-I
@ -79,7 +88,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-I-217
CGAL_INSTALL_DOC_DIR:STRING=share/doc/CGAL-4.1-I-118
//The folder where CGAL header files will be installed, relative
// to CMAKE_INSTALL_PREFIX
@ -93,67 +102,39 @@ CGAL_INSTALL_LIB_DIR:STRING=lib
// relative to CMAKE_INSTALL_PREFIX
CGAL_INSTALL_MAN_DIR:STRING=share/man/man1
//Value Computed by CMake
CGAL_ImageIO_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/src/ImageIO
//The CGAL_ImageIO library
CGAL_ImageIO_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL_ImageIO.so
CGAL_ImageIO_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16/lib/libCGAL_ImageIO.so
//Dependencies for the target
CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so;
//Value Computed by CMake
CGAL_ImageIO_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALImageIO
CGAL_ImageIO_LIB_DEPENDS:STATIC=general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16/lib/libCGAL.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_system-mt.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;/usr/lib64/libz.so;
//The CGAL library
CGAL_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL.so
CGAL_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16/lib/libCGAL.so
//Dependencies for the target
CGAL_LIB_DEPENDS:STATIC=general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;
CGAL_LIB_DEPENDS:STATIC=general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_system-mt.so;
//Directory containing the Maintenance package
CGAL_MAINTENANCE_PACKAGE_DIR:PATH=/home/lrineau/CGAL/CGAL-I
//Value Computed by CMake
CGAL_Qt3_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/src/Qt3
//The CGAL_Qt3 library
CGAL_Qt3_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL_Qt3.so
CGAL_Qt3_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16/lib/libCGAL_Qt3.so
//Dependencies for the target
CGAL_Qt3_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;
//Value Computed by CMake
CGAL_Qt3_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt3
//Value Computed by CMake
CGAL_Qt4_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/src/Qt4
CGAL_Qt3_LIB_DEPENDS:STATIC=general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16/lib/libCGAL.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_system-mt.so;general;/usr/lib64/qt-3.3/lib/libqassistantclient.a;general;/usr/lib64/qt-3.3/lib/libqt-mt.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;general;dl;general;-lpthread;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;
//The CGAL_Qt4 library
CGAL_Qt4_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL_Qt4.so
CGAL_Qt4_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16/lib/libCGAL_Qt4.so
//Dependencies for the target
CGAL_Qt4_LIB_DEPENDS:STATIC=general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;general;/home/lrineau/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL.so;general;/usr/lib64/libgmpxx.so;general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;
//Value Computed by CMake
CGAL_Qt4_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I/src/CGALQt4
//soname-version
CGAL_SONAME_VERSION:STRING=7
CGAL_Qt4_LIB_DEPENDS:STATIC=general;/usr/lib64/libmpfr.so;general;/usr/lib64/libgmp.so;general;/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16/lib/libCGAL.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;general;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_system-mt.so;optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so;optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so;optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so;general;/usr/lib64/libGLU.so;general;/usr/lib64/libGL.so;general;/usr/lib64/libSM.so;general;/usr/lib64/libICE.so;general;/usr/lib64/libX11.so;general;/usr/lib64/libXext.so;
//Value Computed by CMake
CGAL_SOURCE_DIR:STATIC=/home/lrineau/CGAL/CGAL-I
//soversion
CGAL_SOVERSION:STRING=7.0.0
//Path to a program.
CMAKE_AR:FILEPATH=/usr/bin/ar
//For backwards compatibility, what version of CMake commands and
// syntax should this version of CMake try to support.
CMAKE_BACKWARDS_COMPATIBILITY:STRING=2.4
//Build type: Release or Debug
CMAKE_BUILD_TYPE:STRING=Release
@ -161,10 +142,10 @@ CMAKE_BUILD_TYPE:STRING=Release
CMAKE_COLOR_MAKEFILE:BOOL=ON
//CXX compiler.
CMAKE_CXX_COMPILER:FILEPATH=/opt/intel/composerxe-2011.4.191/bin/intel64/icpc
CMAKE_CXX_COMPILER:FILEPATH=/opt/intel/composer_xe_2011_sp1.10.319/bin/intel64/icpc
//User-defined flags
CMAKE_CXX_FLAGS:STRING=-D__SIZEOF_LONG__=8 -D__SIZEOF_LONG_LONG__=8 -fp-model strict -strict-ansi -DBOOST_NO_HASH -diag-disable 980 -diag-disable 11 -diag-disable 1292 -diag-disable 279 -diag-disable 2536 -w1 -O3
CMAKE_CXX_FLAGS:STRING=-I/home/lrineau/CGAL/boost/boost-release-branch/include -D__SIZEOF_LONG__=8 -D__SIZEOF_LONG_LONG__=8 -fp-model strict -DBOOST_NO_HASH -diag-disable 980 -diag-disable 11 -diag-disable 1292 -diag-disable 279 -diag-disable 2536 -w1 -O3
//Flags used by the compiler during debug builds.
CMAKE_CXX_FLAGS_DEBUG:STRING=-g
@ -181,7 +162,7 @@ CMAKE_CXX_FLAGS_RELEASE:STRING=-O3
CMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING=-O2 -g
//C compiler.
CMAKE_C_COMPILER:FILEPATH=/opt/intel/composerxe-2011.4.191/bin/intel64/icc
CMAKE_C_COMPILER:FILEPATH=/opt/intel/composer_xe_2011_sp1.10.319/bin/intel64/icc
//Flags used by the compiler during all build types.
CMAKE_C_FLAGS:STRING=
@ -201,7 +182,7 @@ CMAKE_C_FLAGS_RELEASE:STRING=-O3 -DNDEBUG
CMAKE_C_FLAGS_RELWITHDEBINFO:STRING=-O2 -g
//Flags used by the linker.
CMAKE_EXE_LINKER_FLAGS:STRING=
CMAKE_EXE_LINKER_FLAGS:STRING=' '
//Flags used by the linker during debug builds.
CMAKE_EXE_LINKER_FLAGS_DEBUG:STRING=
@ -228,7 +209,7 @@ CMAKE_LINKER:FILEPATH=/usr/bin/ld
CMAKE_MAKE_PROGRAM:FILEPATH=/usr/bin/gmake
//Flags used by the linker during the creation of modules.
CMAKE_MODULE_LINKER_FLAGS:STRING=
CMAKE_MODULE_LINKER_FLAGS:STRING=' '
//Flags used by the linker during debug builds.
CMAKE_MODULE_LINKER_FLAGS_DEBUG:STRING=
@ -258,7 +239,7 @@ CMAKE_PROJECT_NAME:STATIC=CGAL
CMAKE_RANLIB:FILEPATH=/usr/bin/ranlib
//Flags used by the linker during the creation of dll's.
CMAKE_SHARED_LINKER_FLAGS:STRING=
CMAKE_SHARED_LINKER_FLAGS:STRING=' '
//Flags used by the linker during debug builds.
CMAKE_SHARED_LINKER_FLAGS_DEBUG:STRING=
@ -272,8 +253,12 @@ CMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING=
//Flags used by the linker during Release with Debug Info builds.
CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING=
//If set, runtime paths are not added when installing shared libraries,
// but are added when building.
CMAKE_SKIP_INSTALL_RPATH:BOOL=NO
//If set, runtime paths are not added when using shared libraries.
CMAKE_SKIP_RPATH:BOOL=OFF
CMAKE_SKIP_RPATH:BOOL=NO
//Path to a program.
CMAKE_STRIP:FILEPATH=/usr/bin/strip
@ -285,13 +270,7 @@ CMAKE_USE_RELATIVE_PATHS:BOOL=OFF
// .SILENT directive, and all commands will be echoed to the console
// during the make. This is useful for debugging only. With Visual
// Studio IDE projects all commands are done without /nologo.
CMAKE_VERBOSE_MAKEFILE:BOOL=OFF
//The directory containing the GMPXX include files
GMPXX_INCLUDE_DIR:PATH=/usr/include
//Path to the GMPXX library
GMPXX_LIBRARIES:FILEPATH=/usr/lib64/libgmpxx.so
CMAKE_VERBOSE_MAKEFILE:BOOL=FALSE
//The directory containing the GMP header files
GMP_INCLUDE_DIR:PATH=/usr/include
@ -630,7 +609,7 @@ QT_QTCLUCENE_LIBRARY_DEBUG:FILEPATH=/usr/lib64/libQtCLucene_debug.so
//Path to a library.
QT_QTCLUCENE_LIBRARY_RELEASE:FILEPATH=/usr/lib64/libQtCLucene.so
//(This variable does not exist and should not be used)
//Path to a file.
QT_QTCORE_INCLUDE_DIR:PATH=/usr/include/QtCore
//The Qt QTCORE library
@ -910,7 +889,7 @@ QT_QTXML_LIBRARY_RELEASE:FILEPATH=/usr/lib64/libQtXml.so
QT_QWEBVIEW_PLUGIN_DEBUG:FILEPATH=QT_QWEBVIEW_PLUGIN_DEBUG-NOTFOUND
//Path to a library.
QT_QWEBVIEW_PLUGIN_RELEASE:FILEPATH=/usr/lib64/qt4/plugins/designer/libqwebview.so
QT_QWEBVIEW_PLUGIN_RELEASE:FILEPATH=QT_QWEBVIEW_PLUGIN_RELEASE-NOTFOUND
//Path to a library.
QT_QWSTSLIBMOUSEHANDLER_PLUGIN_DEBUG:FILEPATH=QT_QWSTSLIBMOUSEHANDLER_PLUGIN_DEBUG-NOTFOUND
@ -942,6 +921,9 @@ QT_WORLDTIMECLOCKPLUGIN_PLUGIN_DEBUG:FILEPATH=QT_WORLDTIMECLOCKPLUGIN_PLUGIN_DEB
//Path to a library.
QT_WORLDTIMECLOCKPLUGIN_PLUGIN_RELEASE:FILEPATH=/usr/lib64/qt4/plugins/designer/libworldtimeclockplugin.so
//Select external library BLAS
WITH_BLAS:BOOL=OFF
//Enable CGAL component Core
WITH_CGAL_Core:BOOL=ON
@ -954,24 +936,60 @@ WITH_CGAL_Qt3:BOOL=ON
//Enable CGAL component Qt4
WITH_CGAL_Qt4:BOOL=ON
//Use the GMP number types if available.
//Select external library Coin3D
WITH_Coin3D:BOOL=OFF
//Select external library ESBTL
WITH_ESBTL:BOOL=OFF
//Select external library Eigen3
WITH_Eigen3:BOOL=OFF
//Select external library GMP
WITH_GMP:BOOL=ON
//Search for GMPXX
WITH_GMPXX:BOOL=ON
//Select external library GMPXX
WITH_GMPXX:BOOL=OFF
//Use the LEDA number types if available.
//Select external library IPE
WITH_IPE:BOOL=OFF
//Select external library LAPACK
WITH_LAPACK:BOOL=OFF
//Select external library LEDA
WITH_LEDA:BOOL=OFF
//Use MPFI if available.
//Select external library MPFI
WITH_MPFI:BOOL=OFF
//Use NTL if available.
//Select external library MPFR
WITH_MPFR:BOOL=ON
//Select external library NTL
WITH_NTL:BOOL=OFF
//Use RS if available.
//Select external library OpenGL
WITH_OpenGL:BOOL=OFF
//Select external library OpenNL
WITH_OpenNL:BOOL=OFF
//Select external library QGLViewer
WITH_QGLViewer:BOOL=OFF
//Select external library RS
WITH_RS:BOOL=OFF
//Select external library RS3
WITH_RS3:BOOL=OFF
//Select external library TAUCS
WITH_TAUCS:BOOL=OFF
//Select external library ZLIB
WITH_ZLIB:BOOL=OFF
//Select demos
WITH_demos:BOOL=OFF
@ -1000,7 +1018,7 @@ X11_X11_LIB:FILEPATH=/usr/lib64/libX11.so
X11_XRes_INCLUDE_PATH:PATH=/usr/include
//Path to a library.
X11_XRes_LIB:FILEPATH=X11_XRes_LIB-NOTFOUND
X11_XRes_LIB:FILEPATH=/usr/lib64/libXRes.so
//Path to a file.
X11_XShm_INCLUDE_PATH:PATH=/usr/include
@ -1090,7 +1108,7 @@ X11_Xkb_INCLUDE_PATH:PATH=/usr/include
X11_Xkbfile_INCLUDE_PATH:PATH=/usr/include
//Path to a library.
X11_Xkbfile_LIB:FILEPATH=X11_Xkbfile_LIB-NOTFOUND
X11_Xkbfile_LIB:FILEPATH=/usr/lib64/libxkbfile.so
//Path to a file.
X11_Xkblib_INCLUDE_PATH:PATH=/usr/include
@ -1098,6 +1116,12 @@ X11_Xkblib_INCLUDE_PATH:PATH=/usr/include
//Path to a file.
X11_Xlib_INCLUDE_PATH:PATH=/usr/include
//Path to a file.
X11_Xmu_INCLUDE_PATH:PATH=/usr/include
//Path to a library.
X11_Xmu_LIB:FILEPATH=/usr/lib64/libXmu.so
//Path to a file.
X11_Xpm_INCLUDE_PATH:PATH=/usr/include
@ -1143,6 +1167,9 @@ X11_Xv_LIB:FILEPATH=/usr/lib64/libXv.so
//Path to a library.
X11_Xxf86misc_LIB:FILEPATH=/usr/lib64/libXxf86misc.so
//Path to a library.
X11_Xxf86vm_LIB:FILEPATH=/usr/lib64/libXxf86vm.so
//Path to a file.
X11_dpms_INCLUDE_PATH:PATH=/usr/include
@ -1153,7 +1180,7 @@ X11_xf86misc_INCLUDE_PATH:PATH=/usr/include
X11_xf86vmode_INCLUDE_PATH:PATH=/usr/include
//Path to a program.
XIAR:FILEPATH=/opt/intel/composerxe-2011.4.191/bin/intel64/xiar
XIAR:FILEPATH=/opt/intel/composer_xe_2011_sp1.10.319/bin/intel64/xiar
//Path to a file.
ZLIB_INCLUDE_DIR:PATH=/usr/include
@ -1166,14 +1193,20 @@ ZLIB_LIBRARY:FILEPATH=/usr/lib64/libz.so
# INTERNAL cache entries
########################
//Name of all CGAL libraries.
ALL_CGAL_LIBRARIES:INTERNAL=CGAL;CGAL_Core;CGAL_ImageIO;CGAL_Qt3;CGAL_Qt4
//ADVANCED property for variable: Boost_INCLUDE_DIR
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_49
//Whether the Boost SYSTEM library found
Boost_SYSTEM_FOUND:INTERNAL=ON
//ADVANCED property for variable: Boost_SYSTEM_LIBRARY
Boost_SYSTEM_LIBRARY-ADVANCED:INTERNAL=1
//ADVANCED property for variable: Boost_SYSTEM_LIBRARY_DEBUG
Boost_SYSTEM_LIBRARY_DEBUG-ADVANCED:INTERNAL=1
//ADVANCED property for variable: Boost_SYSTEM_LIBRARY_RELEASE
Boost_SYSTEM_LIBRARY_RELEASE-ADVANCED:INTERNAL=1
//Whether the Boost THREAD library found
Boost_THREAD_FOUND:INTERNAL=ON
//ADVANCED property for variable: Boost_THREAD_LIBRARY
@ -1185,9 +1218,10 @@ Boost_THREAD_LIBRARY_RELEASE-ADVANCED:INTERNAL=1
//The version number for boost libraries
Boost_VERSION:INTERNAL=104900
CGAL_3RD_PARTY_DEFINITIONS:INTERNAL=
CGAL_3RD_PARTY_INCLUDE_DIRS:INTERNAL=/usr/include;/usr/include;/usr/include;/home/lrineau/CGAL/boost/boost-release-branch
CGAL_3RD_PARTY_LIBRARIES:INTERNAL=/usr/lib64/libgmpxx.so;/usr/lib64/libmpfr.so;/usr/lib64/libgmp.so;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so
CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=/usr/lib64;/usr/lib64;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib
CGAL_3RD_PARTY_INCLUDE_DIRS:INTERNAL=/home/lrineau/CGAL/boost/boost-release-branch
CGAL_3RD_PARTY_LIBRARIES:INTERNAL=/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so;/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_system-mt.so
CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib
CGAL_3RD_PARTY_PRECONFIGURED:INTERNAL=
//ADVANCED property for variable: CGAL_Boost_USE_STATIC_LIBS
CGAL_Boost_USE_STATIC_LIBS-ADVANCED:INTERNAL=1
CGAL_CFG_ARRAY_MEMBER_INITIALIZATION_BUG:INTERNAL=1
@ -1205,9 +1239,6 @@ CGAL_CFG_IEEE_754_BUG_COMPILED:INTERNAL=TRUE
CGAL_CFG_ISTREAM_INT_BUG:INTERNAL=0
//Result of TRY_COMPILE
CGAL_CFG_ISTREAM_INT_BUG_COMPILED:INTERNAL=TRUE
CGAL_CFG_LONGNAME_BUG:INTERNAL=0
//Result of TRY_COMPILE
CGAL_CFG_LONGNAME_BUG_COMPILED:INTERNAL=TRUE
CGAL_CFG_MATCHING_BUG_5:INTERNAL=0
//Result of TRY_COMPILE
CGAL_CFG_MATCHING_BUG_5_COMPILED:INTERNAL=TRUE
@ -1217,81 +1248,15 @@ CGAL_CFG_MATCHING_BUG_6_COMPILED:INTERNAL=TRUE
CGAL_CFG_NESTED_CLASS_FRIEND_DECLARATION_BUG:INTERNAL=1
//Result of TRY_COMPILE
CGAL_CFG_NESTED_CLASS_FRIEND_DECLARATION_BUG_COMPILED:INTERNAL=FALSE
CGAL_CFG_NO_CPP0X_ARRAY:INTERNAL=1
//Result of TRY_COMPILE
CGAL_CFG_NO_CPP0X_ARRAY_COMPILED:INTERNAL=FALSE
CGAL_CFG_NO_CPP0X_AUTO:INTERNAL=1
//Result of TRY_COMPILE
CGAL_CFG_NO_CPP0X_AUTO_COMPILED:INTERNAL=FALSE
CGAL_CFG_NO_CPP0X_COPY_N:INTERNAL=1
//Result of TRY_COMPILE
CGAL_CFG_NO_CPP0X_COPY_N_COMPILED:INTERNAL=FALSE
CGAL_CFG_NO_CPP0X_DECLTYPE:INTERNAL=1
//Result of TRY_COMPILE
CGAL_CFG_NO_CPP0X_DECLTYPE_COMPILED:INTERNAL=FALSE
CGAL_CFG_NO_CPP0X_DEFAULT_TEMPLATE_ARGUMENTS_FOR_FUNCTION_TEMPLATES:INTERNAL=1
//Result of TRY_COMPILE
CGAL_CFG_NO_CPP0X_DEFAULT_TEMPLATE_ARGUMENTS_FOR_FUNCTION_TEMPLATES_COMPILED:INTERNAL=FALSE
CGAL_CFG_NO_CPP0X_DELEGATING_CONSTRUCTORS:INTERNAL=1
//Result of TRY_COMPILE
CGAL_CFG_NO_CPP0X_DELEGATING_CONSTRUCTORS_COMPILED:INTERNAL=FALSE
CGAL_CFG_NO_CPP0X_DELETED_AND_DEFAULT_FUNCTIONS:INTERNAL=1
//Result of TRY_COMPILE
CGAL_CFG_NO_CPP0X_DELETED_AND_DEFAULT_FUNCTIONS_COMPILED:INTERNAL=FALSE
CGAL_CFG_NO_CPP0X_INITIALIZER_LISTS:INTERNAL=1
//Result of TRY_COMPILE
CGAL_CFG_NO_CPP0X_INITIALIZER_LISTS_COMPILED:INTERNAL=FALSE
CGAL_CFG_NO_CPP0X_ISFINITE:INTERNAL=0
//Result of TRY_COMPILE
CGAL_CFG_NO_CPP0X_ISFINITE_COMPILED:INTERNAL=TRUE
CGAL_CFG_NO_CPP0X_LAMBDAS:INTERNAL=1
//Result of TRY_COMPILE
CGAL_CFG_NO_CPP0X_LAMBDAS_COMPILED:INTERNAL=FALSE
CGAL_CFG_NO_CPP0X_LONG_LONG:INTERNAL=0
//Result of TRY_COMPILE
CGAL_CFG_NO_CPP0X_LONG_LONG_COMPILED:INTERNAL=TRUE
CGAL_CFG_NO_CPP0X_NEXT_PREV:INTERNAL=1
//Result of TRY_COMPILE
CGAL_CFG_NO_CPP0X_NEXT_PREV_COMPILED:INTERNAL=FALSE
CGAL_CFG_NO_CPP0X_RVALUE_REFERENCE:INTERNAL=1
//Result of TRY_COMPILE
CGAL_CFG_NO_CPP0X_RVALUE_REFERENCE_COMPILED:INTERNAL=FALSE
CGAL_CFG_NO_CPP0X_STATIC_ASSERT:INTERNAL=1
//Result of TRY_COMPILE
CGAL_CFG_NO_CPP0X_STATIC_ASSERT_COMPILED:INTERNAL=FALSE
CGAL_CFG_NO_CPP0X_TUPLE:INTERNAL=1
//Result of TRY_COMPILE
CGAL_CFG_NO_CPP0X_TUPLE_COMPILED:INTERNAL=FALSE
CGAL_CFG_NO_CPP0X_VARIADIC_TEMPLATES:INTERNAL=1
//Result of TRY_COMPILE
CGAL_CFG_NO_CPP0X_VARIADIC_TEMPLATES_COMPILED:INTERNAL=FALSE
CGAL_CFG_NO_LIMITS:INTERNAL=0
//Result of TRY_COMPILE
CGAL_CFG_NO_LIMITS_COMPILED:INTERNAL=TRUE
CGAL_CFG_NO_LOGICAL_OPERATORS_ALTERNATIVES:INTERNAL=0
//Result of TRY_COMPILE
CGAL_CFG_NO_LOGICAL_OPERATORS_ALTERNATIVES_COMPILED:INTERNAL=TRUE
CGAL_CFG_NO_MESSAGE_PRAGMA_BUG:INTERNAL=0
//Result of TRY_COMPILE
CGAL_CFG_NO_MESSAGE_PRAGMA_BUG_COMPILED:INTERNAL=TRUE
CGAL_CFG_NO_NEXTAFTER:INTERNAL=0
//Result of TRY_COMPILE
CGAL_CFG_NO_NEXTAFTER_COMPILED:INTERNAL=TRUE
CGAL_CFG_NO_STATEMENT_EXPRESSIONS:INTERNAL=1
//Result of TRY_COMPILE
CGAL_CFG_NO_STATEMENT_EXPRESSIONS_COMPILED:INTERNAL=FALSE
CGAL_CFG_NO_STL:INTERNAL=0
//Result of TRY_COMPILE
CGAL_CFG_NO_STL_COMPILED:INTERNAL=TRUE
CGAL_CFG_NO_TMPL_IN_TMPL_PARAM:INTERNAL=0
//Result of TRY_COMPILE
CGAL_CFG_NO_TMPL_IN_TMPL_PARAM_COMPILED:INTERNAL=TRUE
CGAL_CFG_NO_TR1_ARRAY:INTERNAL=0
//Result of TRY_COMPILE
CGAL_CFG_NO_TR1_ARRAY_COMPILED:INTERNAL=TRUE
CGAL_CFG_NO_TR1_TUPLE:INTERNAL=1
//Result of TRY_COMPILE
CGAL_CFG_NO_TR1_TUPLE_COMPILED:INTERNAL=FALSE
CGAL_CFG_NO_WARNING_CPP_DIRECTIVE_BUG:INTERNAL=0
//Result of TRY_COMPILE
CGAL_CFG_NO_WARNING_CPP_DIRECTIVE_BUG_COMPILED:INTERNAL=TRUE
@ -1311,7 +1276,7 @@ CGAL_CFG_USING_BASE_MEMBER_BUG_2:INTERNAL=0
//Result of TRY_COMPILE
CGAL_CFG_USING_BASE_MEMBER_BUG_2_COMPILED:INTERNAL=TRUE
//Variable hidden from user
CGAL_CGAL_LIBRARY:INTERNAL=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib/libCGAL.so
CGAL_CGAL_LIBRARY:INTERNAL=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16/lib/libCGAL.so
//Variable hidden from user
CGAL_CGAL_LIBRARY_NAME:INTERNAL=libCGAL.so
CGAL_CONFIGURED_LIBRARIES:INTERNAL=CGAL;Core;ImageIO;Qt3;Qt4
@ -1323,7 +1288,47 @@ CGAL_Core_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=
CGAL_Core_LIBRARY-ADVANCED:INTERNAL=1
//Variable hidden from user
CGAL_Core_LIBRARY_NAME:INTERNAL=libCGAL_Core.so
//Variable hidden from user
CGAL_ESSENTIAL_3RD_PARTY_LIBRARIES:INTERNAL=GMP;MPFR;GMP;MPFR;GMP;MPFR;GMP;MPFR;GMP;MPFR
CGAL_EXECUTABLE_TARGETS:INTERNAL=
//Variable hidden from user
CGAL_EXT_LIB_BLAS_PREFIX:INTERNAL=BLAS
//Variable hidden from user
CGAL_EXT_LIB_Coin3D_PREFIX:INTERNAL=COIN3D
//Variable hidden from user
CGAL_EXT_LIB_ESBTL_PREFIX:INTERNAL=ESBTL
//Variable hidden from user
CGAL_EXT_LIB_Eigen3_PREFIX:INTERNAL=EIGEN3
//Variable hidden from user
CGAL_EXT_LIB_GMPXX_PREFIX:INTERNAL=GMPXX
//Variable hidden from user
CGAL_EXT_LIB_GMP_PREFIX:INTERNAL=GMP
//Variable hidden from user
CGAL_EXT_LIB_IPE_PREFIX:INTERNAL=IPE
//Variable hidden from user
CGAL_EXT_LIB_LAPACK_PREFIX:INTERNAL=LAPACK
//Variable hidden from user
CGAL_EXT_LIB_LEDA_PREFIX:INTERNAL=LEDA
//Variable hidden from user
CGAL_EXT_LIB_MPFI_PREFIX:INTERNAL=MPFI
//Variable hidden from user
CGAL_EXT_LIB_MPFR_PREFIX:INTERNAL=MPFR
//Variable hidden from user
CGAL_EXT_LIB_NTL_PREFIX:INTERNAL=NTL
//Variable hidden from user
CGAL_EXT_LIB_OpenGL_PREFIX:INTERNAL=OpenGL
//Variable hidden from user
CGAL_EXT_LIB_OpenNL_PREFIX:INTERNAL=OpenNL
//Variable hidden from user
CGAL_EXT_LIB_QGLViewer_PREFIX:INTERNAL=QGLVIEWER
//Variable hidden from user
CGAL_EXT_LIB_RS3_PREFIX:INTERNAL=RS3
//Variable hidden from user
CGAL_EXT_LIB_RS_PREFIX:INTERNAL=RS
//Variable hidden from user
CGAL_EXT_LIB_TAUCS_PREFIX:INTERNAL=TAUCS
//Variable hidden from user
CGAL_EXT_LIB_ZLIB_PREFIX:INTERNAL=ZLIB
CGAL_ImageIO_3RD_PARTY_DEFINITIONS:INTERNAL=-DCGAL_USE_ZLIB
CGAL_ImageIO_3RD_PARTY_INCLUDE_DIRS:INTERNAL=/usr/include;/usr/include
CGAL_ImageIO_3RD_PARTY_LIBRARIES:INTERNAL=/usr/lib64/libGLU.so;/usr/lib64/libGL.so;/usr/lib64/libSM.so;/usr/lib64/libICE.so;/usr/lib64/libX11.so;/usr/lib64/libXext.so;/usr/lib64/libz.so
@ -1353,26 +1358,22 @@ CGAL_Qt4_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=
CGAL_Qt4_LIBRARY-ADVANCED:INTERNAL=1
//Variable hidden from user
CGAL_Qt4_LIBRARY_NAME:INTERNAL=libCGAL_Qt4.so
//ADVANCED property for variable: CGAL_SONAME_VERSION
CGAL_SONAME_VERSION-ADVANCED:INTERNAL=1
//ADVANCED property for variable: CGAL_SOVERSION
CGAL_SOVERSION-ADVANCED:INTERNAL=1
//Variable hidden from user
CGAL_SUPPORTING_3RD_PARTY_LIBRARIES:INTERNAL=GMP;GMPXX;MPFR;ZLIB;OpenGL;LEDA;MPFI;RS;RS3;OpenNL;TAUCS;Eigen3;BLAS;LAPACK;QGLViewer;ESBTL;Coin3D;NTL;IPE
//ADVANCED property for variable: CMAKE_AR
CMAKE_AR-ADVANCED:INTERNAL=1
//ADVANCED property for variable: CMAKE_BACKWARDS_COMPATIBILITY
CMAKE_BACKWARDS_COMPATIBILITY-ADVANCED:INTERNAL=1
//ADVANCED property for variable: CMAKE_BUILD_TOOL
CMAKE_BUILD_TOOL-ADVANCED:INTERNAL=1
//What is the target build tool cmake is generating for.
CMAKE_BUILD_TOOL:INTERNAL=/usr/bin/gmake
//This is the directory where this CMakeCache.txt was created
CMAKE_CACHEFILE_DIR:INTERNAL=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi
CMAKE_CACHEFILE_DIR:INTERNAL=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16
//Major version of cmake used to create the current loaded cache
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=7
CMAKE_CACHE_PATCH_VERSION:INTERNAL=8
//ADVANCED property for variable: CMAKE_COLOR_MAKEFILE
CMAKE_COLOR_MAKEFILE-ADVANCED:INTERNAL=1
//Path to CMake executable.
@ -1412,7 +1413,7 @@ CMAKE_DETERMINE_CXX_ABI_COMPILED:INTERNAL=TRUE
//Result of TRY_COMPILE
CMAKE_DETERMINE_C_ABI_COMPILED:INTERNAL=TRUE
//Path to cache edit program executable.
CMAKE_EDIT_COMMAND:INTERNAL=/usr/bin/cmake-gui
CMAKE_EDIT_COMMAND:INTERNAL=/usr/bin/ccmake
//Executable file format
CMAKE_EXECUTABLE_FORMAT:INTERNAL=ELF
//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS
@ -1433,11 +1434,13 @@ CMAKE_GENERATOR:INTERNAL=Unix Makefiles
CMAKE_HAVE_CONNECT:INTERNAL=1
//Have function gethostbyname
CMAKE_HAVE_GETHOSTBYNAME:INTERNAL=1
//Have symbol pthread_create
CMAKE_HAVE_LIBC_CREATE:INTERNAL=
//Have library pthreads
CMAKE_HAVE_PTHREADS_CREATE:INTERNAL=
//Have library pthread
CMAKE_HAVE_PTHREAD_CREATE:INTERNAL=1
//Have include CMAKE_HAVE_PTHREAD_H
//Have include pthread.h
CMAKE_HAVE_PTHREAD_H:INTERNAL=1
//Have function remove
CMAKE_HAVE_REMOVE:INTERNAL=1
@ -1486,28 +1489,31 @@ CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
CMAKE_SHARED_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO
CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
//ADVANCED property for variable: CMAKE_SKIP_INSTALL_RPATH
CMAKE_SKIP_INSTALL_RPATH-ADVANCED:INTERNAL=1
//ADVANCED property for variable: CMAKE_SKIP_RPATH
CMAKE_SKIP_RPATH-ADVANCED:INTERNAL=1
//ADVANCED property for variable: CMAKE_STRIP
CMAKE_STRIP-ADVANCED:INTERNAL=1
//Suppress Warnings that are meant for the author of the CMakeLists.txt
// files.
CMAKE_SUPPRESS_DEVELOPER_WARNINGS:INTERNAL=FALSE
//uname command
CMAKE_UNAME:INTERNAL=/bin/uname
//ADVANCED property for variable: CMAKE_USE_RELATIVE_PATHS
CMAKE_USE_RELATIVE_PATHS-ADVANCED:INTERNAL=1
//ADVANCED property for variable: CMAKE_VERBOSE_MAKEFILE
CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1
CONFIG_CXX_FLAGS:INTERNAL=-D__SIZEOF_LONG__=8 -D__SIZEOF_LONG_LONG__=8 -fp-model strict -strict-ansi -DBOOST_NO_HASH -diag-disable 980 -diag-disable 11 -diag-disable 1292 -diag-disable 279 -diag-disable 2536 -w1 -O3
CONFIG_CXX_FLAGS:INTERNAL=-I/home/lrineau/CGAL/boost/boost-release-branch/include -D__SIZEOF_LONG__=8 -D__SIZEOF_LONG_LONG__=8 -fp-model strict -DBOOST_NO_HASH -diag-disable 980 -diag-disable 11 -diag-disable 1292 -diag-disable 279 -diag-disable 2536 -w1 -O3
//Variable hidden from user
EXECUTABLE_OUTPUT_PATH:INTERNAL=
//Details about finding GMP
FIND_PACKAGE_MESSAGE_DETAILS_GMP:INTERNAL=[/usr/lib64/libgmp.so][/usr/include][v()]
//Details about finding MPFR
FIND_PACKAGE_MESSAGE_DETAILS_MPFR:INTERNAL=[/usr/lib64/libmpfr.so][/usr/include][v()]
//Details about finding OpenGL
FIND_PACKAGE_MESSAGE_DETAILS_OpenGL:INTERNAL=[/usr/lib64/libGL.so][v()]
//Details about finding Threads
FIND_PACKAGE_MESSAGE_DETAILS_Threads:INTERNAL=[TRUE][v()]
//Details about finding X11
FIND_PACKAGE_MESSAGE_DETAILS_X11:INTERNAL=[/usr/lib64/libX11.so][/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include]
FIND_PACKAGE_MESSAGE_DETAILS_X11:INTERNAL=[/usr/lib64/libX11.so][/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include;/usr/include]
//Details about finding ZLIB
FIND_PACKAGE_MESSAGE_DETAILS_ZLIB:INTERNAL=[/usr/lib64/libz.so][/usr/include][v1.2.5()]
//Result of TRY_COMPILE
@ -1519,7 +1525,7 @@ IntelCompiler_COMPILE_RES:INTERNAL=TRUE
//Result of TRY_RUN
IntelCompiler_RUN_RES:INTERNAL=0
//Variable hidden from user
LIBRARY_OUTPUT_PATH:INTERNAL=/home/lrineau/CGAL/Packages/trunk/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/lib
LIBRARY_OUTPUT_PATH:INTERNAL=
//Result of TRY_COMPILE
MPFR_COMPILE_RES:INTERNAL=TRUE
//Result of TRY_RUN
@ -1971,18 +1977,6 @@ Q_WS_QWS:INTERNAL=
Q_WS_WIN:INTERNAL=
//Have symbol Q_WS_X11
Q_WS_X11:INTERNAL=1
//hide this
Qt_help_window_h:INTERNAL=/home/lrineau/CGAL/CGAL-I/include/CGAL/IO/Qt_help_window.h
//hide this
Qt_widget_OpenGL_h:INTERNAL=/home/lrineau/CGAL/CGAL-I/include/CGAL/IO/Qt_widget_OpenGL.h
//hide this
Qt_widget_h:INTERNAL=/home/lrineau/CGAL/CGAL-I/include/CGAL/IO/Qt_widget.h
//hide this
Qt_widget_history_h:INTERNAL=/home/lrineau/CGAL/CGAL-I/include/CGAL/IO/Qt_widget_history.h
//hide this
Qt_widget_layer_h:INTERNAL=/home/lrineau/CGAL/CGAL-I/include/CGAL/IO/Qt_widget_layer.h
//hide this
Qt_widget_standard_toolbar_h:INTERNAL=/home/lrineau/CGAL/CGAL-I/include/CGAL/IO/Qt_widget_standard_toolbar.h
//ADVANCED property for variable: X11_ICE_INCLUDE_PATH
X11_ICE_INCLUDE_PATH-ADVANCED:INTERNAL=1
//ADVANCED property for variable: X11_ICE_LIB
@ -2065,6 +2059,10 @@ X11_Xkbfile_LIB-ADVANCED:INTERNAL=1
X11_Xkblib_INCLUDE_PATH-ADVANCED:INTERNAL=1
//ADVANCED property for variable: X11_Xlib_INCLUDE_PATH
X11_Xlib_INCLUDE_PATH-ADVANCED:INTERNAL=1
//ADVANCED property for variable: X11_Xmu_INCLUDE_PATH
X11_Xmu_INCLUDE_PATH-ADVANCED:INTERNAL=1
//ADVANCED property for variable: X11_Xmu_LIB
X11_Xmu_LIB-ADVANCED:INTERNAL=1
//ADVANCED property for variable: X11_Xpm_INCLUDE_PATH
X11_Xpm_INCLUDE_PATH-ADVANCED:INTERNAL=1
//ADVANCED property for variable: X11_Xpm_LIB
@ -2095,6 +2093,8 @@ X11_Xv_INCLUDE_PATH-ADVANCED:INTERNAL=1
X11_Xv_LIB-ADVANCED:INTERNAL=1
//ADVANCED property for variable: X11_Xxf86misc_LIB
X11_Xxf86misc_LIB-ADVANCED:INTERNAL=1
//ADVANCED property for variable: X11_Xxf86vm_LIB
X11_Xxf86vm_LIB-ADVANCED:INTERNAL=1
//ADVANCED property for variable: X11_dpms_INCLUDE_PATH
X11_dpms_INCLUDE_PATH-ADVANCED:INTERNAL=1
//ADVANCED property for variable: X11_xf86misc_INCLUDE_PATH

View File

@ -1,7 +1,7 @@
source /opt/intel/composerxe-2011.4.191/bin/compilervars.sh intel64
source /opt/intel/composer_xe_2011_sp1/bin/compilervars.sh intel64
CXX=icpc
CC=icc
CXXFLAGS="-D__SIZEOF_LONG__=8 -D__SIZEOF_LONG_LONG__=8 -strict-ansi"
CXXFLAGS="-D__SIZEOF_LONG__=8 -D__SIZEOF_LONG_LONG__=8 -fp-model strict -DBOOST_NO_HASH -diag-disable 980 -diag-disable 11 -diag-disable 1292 -diag-disable 279 -diag-disable 2536 -w1 -O3"
export CXX CC CXXFLAGS
export QTDIR=/usr/lib64/qt-3.3
source /home/lrineau/CGAL/MPFI-RS/setup-rs

View File

@ -1,7 +1,7 @@
source /opt/intel/composerxe-2011.4.191/bin/compilervars.sh intel64
source /opt/intel/composer_xe_2013/bin/compilervars.sh intel64
CXX=icpc
CC=icc
CXXFLAGS="-D__SIZEOF_LONG__=8 -D__SIZEOF_LONG_LONG__=8"
CXXFLAGS=""
export CXX CC CXXFLAGS
export QTDIR=/usr/lib64/qt-3.3
source /home/lrineau/CGAL/MPFI-RS/setup-rs
@ -11,5 +11,5 @@ BOOST_INCLUDEDIR=/home/lrineau/CGAL/boost/boost-release-branch
BOOST_LIBRARYDIR=/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib
export BOOST_INCLUDEDIR BOOST_LIBRARYDIR
CXXFLAGS="-I$BOOST_INCLUDEDIR/include $CXXFLAGS"
#CXXFLAGS="-I$BOOST_INCLUDEDIR/include $CXXFLAGS"
export CXXFLAGS

View File

@ -70,6 +70,7 @@ tar xf "$DEST_DIR/${PUBLIC_RELEASE_NAME}.tar.gz" --strip-components 1 "${PUBLIC_
printf "Compute md5sum.txt..."
md5sum *.^txt > md5sum.txt
sha256sum *.^txt > sha256sum.txt
popd
printf "Now use:\n"

View File

@ -1 +1 @@
CGAL-4.1-dev
CGAL-4.1-alpha1

View File

@ -492,7 +492,6 @@ two_cover_points(
using std::less;
typedef typename Traits::FT FT;
typedef typename Traits::Point_2 Point_2;
typename Traits::Infinity_distance_2 dist =
d.traits.infinity_distance_2_object();
typename Traits::Signed_infinity_distance_2 sdist =

View File

@ -865,7 +865,6 @@ rectangular_3_center_2_type2(
using std::pair;
typedef typename Operations::Point Point;
typedef typename Operations::Distance Distance;
typedef pair< RandomAccessIterator, RandomAccessIterator > IP;
typename Operations::Construct_iso_rectangle_2

View File

@ -161,9 +161,7 @@ sorted_matrix_search(InputIterator f, InputIterator l, Traits t)
typedef Matrix_cell< PaddedMatrix > Cell;
typedef std::vector< Cell > Cell_container;
typedef typename Cell_container::iterator Cell_iterator;
typedef typename Cell_container::reverse_iterator Cell_reverse_iterator;
typedef typename Cell_container::size_type size_type ;
// typedef typename Cell_container::reverse_iterator Cell_reverse_iterator;
Cell_container active_cells;

View File

@ -77,9 +77,6 @@ public:
typedef typename Geom_traits::Compute_area_2 Compute_area_2;
typedef typename Geom_traits::Compute_squared_distance_2
Compute_squared_distance_2;
typedef typename Geom_traits::Construct_triangle_2
Construct_triangle_2;
typedef typename Geom_traits::FT FT;
Compute_area_2 area_2 =
traits.compute_area_2_object();

View File

@ -114,9 +114,6 @@ public:
typedef typename Geom_traits::Compute_area_2 Compute_area_2;
typedef typename Geom_traits::Compute_squared_distance_2
Compute_squared_distance_2;
typedef typename Geom_traits::Construct_triangle_2
Construct_triangle_2;
typedef typename Geom_traits::FT FT;
Geom_traits traits; /** @warning traits with data!! */

View File

@ -296,9 +296,6 @@ public:
{
typedef typename Cluster_map::const_iterator Iterator;
typedef std::pair<Iterator, Iterator> Range;
typedef typename Range::first_type Clusters_iterator;
typedef Pair_get_first<typename Cluster_vertices_map::value_type>
Get_first;
Range range = cluster_map.equal_range(vh);
Iterator first = range.first;

View File

@ -197,8 +197,6 @@ bool
Detect_features_in_polyhedra<P_>::
is_sharp(const Halfedge_handle& he, FT cos_angle) const
{
typedef typename Geom_traits::FT FT;
Facet_handle f1 = he->facet();
Facet_handle f2 = he->opposite()->facet();
if(f1 == NULL || f2 == NULL)

View File

@ -806,8 +806,6 @@ non_adjacent_but_intersect(const Vertex_handle& va, const Vertex_handle& vb) con
{
if ( ! c3t3_.is_in_complex(va,vb) )
{
typedef typename Gt::Sphere_3 Sphere_3;
typename Gt::Construct_sphere_3 sphere =
c3t3_.triangulation().geom_traits().construct_sphere_3_object();

View File

@ -397,7 +397,6 @@ protected:
{
typedef typename Tr::Vertex_handle Vertex_handle;
typedef typename Tr::Cell_handle Cell_handle;
typedef typename Tr::Vertex::Index Index;
const Cell_handle& ch = f.first;
const int i = f.second;

View File

@ -34,7 +34,6 @@ radius_ratio(const typename K::Point_3& p0,
K k = K())
{
typedef typename K::FT FT;
typedef typename K::Point_3 Point_3;
typename K::Compute_squared_distance_3 sq_distance =
k.compute_squared_distance_3_object();
typename K::Compute_squared_radius_3 comp_sq_circumradius =

View File

@ -569,7 +569,6 @@ is_valid() const
const Bare_point& p = it->right->point().point();
const Bare_point& q = it->left->point().point();
typedef typename Tr::Geom_traits::Sphere_3 Sphere_3;
typename Tr::Geom_traits::Construct_sphere_3 sphere =
this->triangulation().geom_traits().construct_sphere_3_object();

View File

@ -554,9 +554,6 @@ Polyhedral_mesh_domain_3<P_,IGT_,TA,Tag,E_tag_>::
Construct_initial_points::operator()(OutputIterator pts,
const int n) const
{
typedef boost::optional<typename AABB_tree_::Object_and_primitive_id>
AABB_intersection;
typename IGT::Construct_ray_3 ray = IGT().construct_ray_3_object();
typename IGT::Construct_vector_3 vector = IGT().construct_vector_3_object();

View File

@ -64,7 +64,6 @@ lloyd_optimize_mesh_3_impl(C3T3& c3t3,
const double freeze_bound)
{
typedef typename C3T3::Triangulation Tr;
typedef typename Tr::Geom_traits Gt;
typedef Mesh_3::Mesh_sizing_field<Tr> Sizing;
typedef typename Mesh_3::Lloyd_move<C3T3,Sizing> Move;

View File

@ -65,7 +65,6 @@ odt_optimize_mesh_3_impl(C3T3& c3t3,
const double freeze_ratio)
{
typedef typename C3T3::Triangulation Tr;
typedef typename Tr::Geom_traits Gt;
typedef Mesh_3::Mesh_sizing_field<Tr> Sizing;
typedef typename Mesh_3::Odt_move<C3T3,Sizing> Move;

View File

@ -310,7 +310,6 @@ void refine_mesh_3_impl(C3T3& c3t3,
bool reset_c3t3)
{
typedef Mesh_3::Mesher_3<C3T3, MeshCriteria, MeshDomain> Mesher;
typedef typename C3T3::Triangulation::Geom_traits Gt;
// Reset c3t3 (i.e. remove weights) if needed
if ( reset_c3t3 )

View File

@ -150,7 +150,6 @@ inset_polygon_2 (const Polygon_2<typename ConicTraits::Rat_kernel,
{
typedef Exact_offset_base_2<ConicTraits, Container> Base;
typedef Offset_by_convolution_2<Base> Exact_offset_2;
typedef typename Exact_offset_2::Offset_polygon_2 Offset_polygon_2;
Base base;
Exact_offset_2 exact_offset (base);

View File

@ -306,14 +306,13 @@ inline std::ostream& operator << (std::ostream& os, const Residue& p) {
}
inline std::istream& operator >> (std::istream& is, Residue& p) {
typedef Residue RES;
char ch;
int prime;
is >> p.x();
is >> ch; // read the %
is >> prime; // read the prime
CGAL_precondition(prime==RES::get_current_prime());
CGAL_precondition(prime==Residue::get_current_prime());
return is;
}

View File

@ -432,8 +432,6 @@ check_integrity_and_topological_planarity(bool faces) const
EI(halfedges_begin(),halfedges_end(),'e');
Object_index<Face_const_iterator>
FI(faces_begin(),faces_end(),'f');
typedef Halfedge_around_vertex_const_circulator hvc_circulator;
typedef Halfedge_around_face_const_circulator hfc_circulator;
Vertex_const_handle vit, vend = phds->vertices_end();
int iso_vert_num=0;
/* check the source links of out edges and count isolated vertices */

View File

@ -782,10 +782,6 @@ public:
typedef typename SNC_structure::Vertex_iterator Vertex_iterator;
typedef typename SNC_structure::Halfedge_iterator Halfedge_iterator;
typedef typename SNC_structure::Halffacet_iterator Halffacet_iterator;
typedef typename SNC_structure::Halffacet_cycle_iterator
Halffacet_cycle_iterator;
typedef typename SNC_structure::SHalfedge_around_facet_circulator
SHalfedge_around_facet_circulator;
CGAL_assertion( W != NULL);
Object_list objects;
@ -799,6 +795,10 @@ public:
objects.push_back(make_object(Halfedge_handle(e)));
CGAL_forall_facets( f, *W) {
#ifdef CGAL_NEF3_TRIANGULATE_FACETS
typedef typename SNC_structure::SHalfedge_around_facet_circulator
SHalfedge_around_facet_circulator;
typedef typename SNC_structure::Halffacet_cycle_iterator
Halffacet_cycle_iterator;
Halffacet_cycle_iterator fci = f->facet_cycles_begin();
CGAL_assertion(fci.is_shalfedge());

View File

@ -498,7 +498,6 @@ public:
Vertex_handle create_from_plane(const Plane_3& pl, const Point_3& p,
const Mark& bnd,
const Mark& in, const Mark& out) const {
typedef typename CGAL::SNC_const_decorator<SNC_structure> SNC_const_decorator;
Vertex_handle v = this->sncp()->new_vertex( p, bnd);
v->point() = p;
Sphere_circle c(pl); // circle through origin parallel to h

View File

@ -712,7 +712,6 @@ class Geometry_io<Cartesian_tag, Kernel> {
void print_point(std::ostream& out, const CGAL::Point_3<R> p) {
typedef Fraction_traits<typename R::FT> FracTraits;
typedef std::vector<typename FracTraits::Numerator_type> NV;
typedef typename NV::iterator NV_iter;
typename FracTraits::Numerator_type num;
typename FracTraits::Denominator_type denom;
@ -745,7 +744,6 @@ class Geometry_io<Cartesian_tag, Kernel> {
typedef Fraction_traits<typename R::FT> FracTraits;
typedef typename FracTraits::Numerator_type NumType;
typedef std::vector<NumType> NV;
typedef typename NV::iterator NV_iter;
typename FracTraits::Numerator_type num;
typename FracTraits::Denominator_type denom;
@ -774,7 +772,6 @@ class Geometry_io<Cartesian_tag, Kernel> {
void print_plane(std::ostream& out, const CGAL::Plane_3<R> p) {
typedef Fraction_traits<typename R::FT> FracTraits;
typedef std::vector<typename FracTraits::Numerator_type> NV;
typedef typename NV::iterator NV_iter;
typename FracTraits::Numerator_type num;
typename FracTraits::Denominator_type denom;

View File

@ -179,7 +179,6 @@ void polyhedron_3_to_nef_3(Polyhedron_& P, SNC_structure& S)
typedef Polyhedron_ Polyhedron;
typedef typename Polyhedron::Facet::Plane_3 Plane;
typedef typename Polyhedron::Traits::Kernel Kernel;
typedef typename SNC_structure::SNC_decorator SNC_decorator;
typedef typename SNC_structure::SM_decorator SM_decorator;
typedef typename SNC_structure::Vertex_handle Vertex_handle;
typedef typename SNC_structure::SVertex_handle SVertex_handle;
@ -187,7 +186,6 @@ void polyhedron_3_to_nef_3(Polyhedron_& P, SNC_structure& S)
typedef typename SNC_structure::SFace_handle SFace_handle;
typedef typename SNC_structure::Point_3 Point_3;
typedef typename SNC_structure::Sphere_point Sphere_point;
typedef typename SNC_structure::Sphere_segment Sphere_segment;
typedef typename SNC_structure::Sphere_circle Sphere_circle;
typedef typename Polyhedron::Halfedge_around_vertex_const_circulator

View File

@ -158,16 +158,10 @@ bool projected_vertex_cycle_to_nef_3 (typename Nef_3::SNC_structure &snc,
typedef typename SNC_structure::SHalfedge_handle SHalfedge_handle;
typedef typename SNC_structure::SFace_handle SFace_handle;
typedef typename SNC_structure::Kernel Kernel;
typedef typename SNC_structure::Point_3 Point_3;
typedef typename std::pair<CTP_vertex*, CTP_vertex*> Point_pair;
typedef Compare_cpte<CTP_vertex> Compare_edge;
typedef CGAL::SNC_point_locator_by_spatial_subdivision
<CGAL::SNC_decorator<SNC_structure> > Point_locator;
typedef typename SNC_structure::Items Items;
typedef CGAL::SNC_constructor<Items, SNC_structure> SNC_constructor;
// declarations and defaults
II v_it, v_pred_it;

View File

@ -291,7 +291,6 @@ class Normalizing<Cartesian_tag> {
typedef typename R::FT FT;
typedef Fraction_traits<FT> FracTraits;
typedef std::vector<typename FracTraits::Numerator_type> NV;
typedef typename NV::iterator NV_iter;
typename FracTraits::Numerator_type num;
typename FracTraits::Denominator_type denom;

View File

@ -294,8 +294,6 @@ check_integrity_and_topological_planarity(bool faces) const
EI(shalfedges_begin(),shalfedges_end(),'e');
Object_index<SFace_const_iterator>
FI(sfaces_begin(),sfaces_end(),'f');
typedef SHalfedge_around_svertex_const_circulator hvc_circulator;
typedef SHalfedge_around_sface_const_circulator hfc_circulator;
SVertex_const_handle v;
int iso_vert_num=0;
/* check the source links of out edges and count isolated vertices */

View File

@ -267,10 +267,12 @@ public:
{
if (! is_extended_)
return CGAL_NTS to_interval(a0_);
CGAL::Interval_nt<false>::Protector p;
const CGAL::Interval_nt<false>& a0_int = CGAL_NTS to_interval(a0_);
const CGAL::Interval_nt<false>& a1_int = CGAL_NTS to_interval(a1_);
const CGAL::Interval_nt<false>& root_int = CGAL_NTS to_interval(root_);
CGAL::Interval_nt<false>::Protector p;
const CGAL::Interval_nt<false>& x_int =
a0_int + (a1_int * CGAL::sqrt(root_int));

View File

@ -135,7 +135,6 @@ OutputIterator partition_approx_convex_2(InputIterator first,
typedef Triangulation_indirect_traits_2<Circulator, Traits> Gt;
typedef Constrained_triangulation_2<Gt> Constrained_tri_2;
typedef typename Constrained_tri_2::Edge_iterator Edge_iterator;
typedef typename Constrained_tri_2::Edge_circulator Edge_circulator;
typedef typename Constrained_tri_2::Vertex_iterator Tri_vertex_iterator;
typedef typename Constrained_tri_2::Vertex_handle Vertex_handle;

View File

@ -361,7 +361,6 @@ void change_top_chain(Polygon& polygon,
{
std::copy(new_point_ref, stack.before_front(),
std::back_inserter(new_polygon));
typedef typename Polygon::iterator iterator;
erase_vertices(top_chain.front(), stack.front(), polygon,
update_required);
top_chain.push_front(stack.front());
@ -801,7 +800,6 @@ OutputIterator partition_greene_approx_convex_2(InputIterator first,
{
if (first == beyond) return result;
typedef typename Traits::Point_2 Point_2;
typedef typename Traits::Polygon_2 Polygon_2;
#if defined(CGAL_PARTITION_NO_POSTCONDITIONS) || \

View File

@ -205,7 +205,6 @@ bool collinearly_visible(unsigned int edge_num1, unsigned int e_num,
const Polygon& polygon,
const Traits& traits)
{
typedef typename Polygon::size_type size_type;
typedef typename Traits::Orientation_2 Orientation_2;
Orientation_2 orientation = traits.orientation_2_object();
@ -447,7 +446,6 @@ void partition_opt_cvx_preprocessing(Polygon& polygon,
{
typedef typename Polygon::size_type size_type;
typedef typename Polygon::iterator Vertex_iterator;
typedef Vertex_visibility_graph_2<Traits> Vis_graph;
typedef typename Traits::Point_2 Point_2;
typedef std::pair<Point_2, Point_2> Point_pair;

View File

@ -2532,7 +2532,6 @@ inline void Periodic_3_triangulation_3<GT,TDS>::periodic_remove(Vertex_handle v,
// with the facet just behind
typedef std::map<Vertex_triple,Facet> Vertex_triple_Facet_map;
typedef PointRemover Point_remover;
typedef typename Point_remover::TDSE TDSE;
typedef typename Point_remover::CellE_handle CellE_handle;
typedef typename Point_remover::VertexE_handle VertexE_handle;
typedef typename Point_remover::FacetE FacetE;
@ -2541,8 +2540,6 @@ inline void Periodic_3_triangulation_3<GT,TDS>::periodic_remove(Vertex_handle v,
Finite_cellsE_iterator;
typedef typename Point_remover::Vertex_triple_FacetE_map
Vertex_triple_FacetE_map;
typedef typename Point_remover::Vertex_triple_FacetE_map_it
Vertex_triple_FacetE_map_it;
// First compute the hole and its boundary vertices.
std::vector<Cell_handle> hole;
@ -3020,7 +3017,6 @@ Periodic_3_triangulation_3<GT,TDS>::convert_to_27_sheeted_covering() {
Virtual_cell_map;
typedef std::map<Cell_handle, std::vector<Cell_handle > >
Virtual_cell_reverse_map;
typedef typename Virtual_cell_map::const_iterator VCMIT;
typedef typename Virtual_cell_reverse_map::const_iterator VCRMIT;
Virtual_cell_map virtual_cells;
@ -3555,8 +3551,6 @@ operator<< (std::ostream& os,const Periodic_3_triangulation_3<GT,TDS> &tr)
typedef typename Triangulation::Vertex_iterator Vertex_iterator;
typedef typename Triangulation::Cell_handle Cell_handle;
typedef typename Triangulation::Cell_iterator Cell_iterator;
typedef typename Triangulation::Edge_iterator Edge_iterator;
typedef typename Triangulation::Facet_iterator Facet_iterator;
typedef typename Triangulation::Covering_sheets Covering_sheets;
typedef typename Triangulation::Offset Offset;
typedef typename Triangulation::Virtual_vertex_map_it Virtual_vertex_map_it;
@ -3754,9 +3748,9 @@ operator==(const Periodic_3_triangulation_3<GT,TDS1> &t1,
typedef typename Periodic_3_triangulation_3<GT,TDS1>::Point Point;
typedef typename Periodic_3_triangulation_3<GT,TDS1>::Offset Offset;
typedef typename Periodic_3_triangulation_3<GT,TDS1>
::Geometric_traits::Compare_xyz_3 Compare_xyz_3;
// typedef typename Periodic_3_triangulation_3<GT,TDS1>
// ::Geometric_traits::Compare_xyz_3 Compare_xyz_3;
// Compare_xyz_3 cmp1 = t1.geom_traits().compare_xyz_3_object();
// Compare_xyz_3 cmp2 = t2.geom_traits().compare_xyz_3_object();

View File

@ -56,8 +56,6 @@ compute_average_spacing(const typename Kernel::Point_3& query, ///< 3D point who
// basic geometric types
typedef typename Kernel::FT FT;
typedef typename Kernel::Point_3 Point;
typedef typename Kernel::Plane_3 Plane;
typedef typename Kernel::Vector_3 Vector;
// types for K nearest neighbors search
typedef Search_traits_3<Kernel> Tree_traits;

View File

@ -61,7 +61,6 @@ jet_estimate_normal(const typename Kernel::Point_3& query, ///< point to compute
{
// basic geometric types
typedef typename Kernel::Point_3 Point;
typedef typename Kernel::Vector_3 Vector;
// types for K nearest neighbors search
typedef typename CGAL::Search_traits_3<Kernel> Tree_traits;

View File

@ -420,10 +420,6 @@ create_mst_graph(
// Bring private stuff to scope
using namespace internal;
// Input points types
typedef typename boost::property_traits<PointPMap>::value_type Point;
typedef typename boost::property_traits<NormalPMap>::value_type Vector;
// Riemannian_graph types
typedef internal::Riemannian_graph<ForwardIterator> Riemannian_graph;
typedef typename boost::property_map<Riemannian_graph, boost::edge_weight_t>::const_type Riemannian_graph_weight_map;
@ -535,8 +531,6 @@ mst_orient_normals(
// Input points types
typedef typename std::iterator_traits<ForwardIterator>::value_type Enriched_point; // actual type of input points
typedef typename boost::property_traits<NormalPMap>::value_type Vector;
// Property map ForwardIterator -> index
typedef Index_property_map<ForwardIterator> IndexPMap;

View File

@ -62,7 +62,6 @@ pca_estimate_normal(const typename Kernel::Point_3& query, ///< point to compute
// basic geometric types
typedef typename Kernel::Point_3 Point;
typedef typename Kernel::Plane_3 Plane;
typedef typename Kernel::Vector_3 Vector;
// types for K nearest neighbors search
typedef typename CGAL::Search_traits_3<Kernel> Tree_traits;

View File

@ -146,7 +146,6 @@ remove_outliers(
typedef typename CGAL::Search_traits_3<Kernel> Tree_traits;
typedef typename CGAL::Orthogonal_k_neighbor_search<Tree_traits> Neighbor_search;
typedef typename Neighbor_search::Tree Tree;
typedef typename Neighbor_search::iterator Search_iterator;
// precondition: at least one element in the container.
// to fix: should have at least three distinct points

View File

@ -129,6 +129,7 @@ if(CGAL_Qt4_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND)
Scene_combinatorial_map_item.cpp
Scene_polygon_soup_item.cpp
Scene_polyhedron_item.cpp
Scene_polyhedron_transform_item.cpp
Scene_polylines_item.cpp
Scene_edit_polyhedron_item.cpp
Scene_textured_polyhedron_item.cpp
@ -176,6 +177,10 @@ if(CGAL_Qt4_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND)
Scene_polyhedron_item.cpp Scene_polyhedron_item.moc)
target_link_libraries(scene_polyhedron_item demo_framework)
add_library(scene_polyhedron_transform_item SHARED
Scene_polyhedron_transform_item.cpp Scene_polyhedron_transform_item.moc)
target_link_libraries(scene_polyhedron_transform_item demo_framework scene_polyhedron_item)
add_library(scene_combinatorial_map_item SHARED
Scene_combinatorial_map_item.cpp Scene_combinatorial_map_item.moc)
target_link_libraries(scene_combinatorial_map_item demo_framework scene_polyhedron_item)
@ -316,6 +321,9 @@ if(CGAL_Qt4_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND)
polyhedron_demo_plugin(xyz_plugin Polyhedron_demo_xyz_plugin)
target_link_libraries(xyz_plugin scene_points_with_normal_item)
polyhedron_demo_plugin(nef_io_plugin Polyhedron_demo_io_nef_plugin)
target_link_libraries(nef_io_plugin scene_nef_polyhedron_item)
polyhedron_demo_plugin(polylines_io_plugin Polyhedron_demo_polylines_io_plugin)
target_link_libraries(polylines_io_plugin scene_polylines_item)
@ -391,6 +399,9 @@ if(CGAL_Qt4_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND)
polyhedron_demo_plugin(intersection_plugin Polyhedron_demo_intersection_plugin)
target_link_libraries(intersection_plugin scene_polyhedron_item scene_polylines_item)
polyhedron_demo_plugin(transform_polyhedron_plugin Polyhedron_demo_transform_polyhedron_plugin)
target_link_libraries(transform_polyhedron_plugin scene_polyhedron_item scene_polyhedron_transform_item)
polyhedron_demo_plugin(corefinement_plugin Polyhedron_demo_corefinement_plugin)
target_link_libraries(corefinement_plugin scene_polyhedron_item scene_combinatorial_map_item scene_polylines_item)

View File

@ -131,7 +131,7 @@ MainWindow::MainWindow(QWidget* parent)
viewer->setScene(scene);
sceneView->setModel(scene);
// setup the treeview: delegation and columns sizing...
// setup the sceneview: delegation and columns sizing...
sceneView->setItemDelegate(new SceneDelegate(this));
sceneView->header()->setStretchLastSection(false);
@ -665,9 +665,46 @@ Polyhedron_demo_io_plugin_interface* MainWindow::find_loader(const QString& load
void MainWindow::open(QString filename)
{
QFileInfo fileinfo(filename);
QString suffix=fileinfo.suffix();
QRegExp extension_rx(tr("\\(\\*.(%1)\\)").arg(suffix));//match (*.XXX) where XXX is the extension of the input file
QRegExp allfiles_rx("\\(\\*?\\.?(\\*)\\)"); //match (*) and (*.*)
QString filename_striped=fileinfo.fileName();
#ifdef QT_SCRIPT_LIB
// Handles the loading of script file from the command line arguments,
// and the special command line arguments that start with "javascript:"
// or "qtscript:"
QString program;
if(filename.startsWith("javascript:")) {
program=filename.right(filename.size() - 11);
}
if(filename.startsWith("qtscript:")) {
program=filename.right(filename.size() - 9);
}
if(filename.endsWith(".js")) {
load_script(fileinfo);
return;
}
if(!program.isEmpty())
{
{
QTextStream(stderr) << "Execution of script \""
<< filename << "\"\n";
// << filename << "\", with following content:\n"
// << program;
}
evaluate_script(program, filename);
return;
}
#endif
if ( !fileinfo.exists() ){
QMessageBox::warning(this,
tr("Cannot open file"),
tr("File %1 does not exist.")
.arg(filename));
return;
}
//match all filters between ()
QRegExp all_filters_rx("\\((.*)\\)");
// collect all io_plugins and offer them to load if the file extension match one name filter
// also collect all available plugin in case of a no extension match
@ -676,12 +713,22 @@ void MainWindow::open(QString filename)
Q_FOREACH(Polyhedron_demo_io_plugin_interface* io_plugin, io_plugins) {
all_items << io_plugin->name();
QStringList split_filters = io_plugin->nameFilters().split(";;");
bool stop=false;
Q_FOREACH(const QString& filter, split_filters) {
if ( extension_rx.indexIn(filter) !=-1 || allfiles_rx.indexIn(filter) !=-1 ){
//extract filters
if ( all_filters_rx.indexIn(filter)!=-1 ){
Q_FOREACH(const QString& pattern,all_filters_rx.cap(1).split(' ')){
QRegExp rx(pattern);
rx.setPatternSyntax(QRegExp::Wildcard);
if ( rx.exactMatch(filename_striped) ){
selected_items << io_plugin->name();
stop=true;
break;
}
}
if (stop) break;
}
}
}
bool ok;
@ -702,10 +749,25 @@ void MainWindow::open(QString filename)
if(!ok || loader_name.isEmpty()) { return; }
Scene_item* scene_item = load_item(filename, find_loader(loader_name));
Scene_item* scene_item = load_item(fileinfo, find_loader(loader_name));
selectSceneItem(scene->addItem(scene_item));
}
bool MainWindow::open(QString filename, QString loader_name) {
QFileInfo fileinfo(filename);
Scene_item* item;
try {
item = load_item(fileinfo, find_loader(loader_name));
}
catch(std::logic_error e) {
std::cerr << e.what() << std::endl;
return false;
}
selectSceneItem(scene->addItem(item));
return true;
}
Scene_item* MainWindow::load_item(QFileInfo fileinfo, Polyhedron_demo_io_plugin_interface* loader) {
Scene_item* item = NULL;
if(!fileinfo.isFile() || !fileinfo.isReadable()) {
@ -726,12 +788,17 @@ Scene_item* MainWindow::load_item(QFileInfo fileinfo, Polyhedron_demo_io_plugin_
void MainWindow::selectSceneItem(int i)
{
if(i < 0) return;
if(i >= scene->numberOfEntries()) return;
if(i < 0 || i >= scene->numberOfEntries()) {
sceneView->selectionModel()->clearSelection();
updateInfo();
updateDisplayInfo();
}
else {
sceneView->selectionModel()->select(scene->createSelection(i),
QItemSelectionModel::ClearAndSelect);
}
}
void MainWindow::showSelectedPoint(double x, double y, double z)
{
@ -914,7 +981,13 @@ void MainWindow::closeEvent(QCloseEvent *event)
event->accept();
}
void MainWindow::load_script(QFileInfo info)
bool MainWindow::load_script(QString filename)
{
QFileInfo fileinfo(filename);
return load_script(fileinfo);
}
bool MainWindow::load_script(QFileInfo info)
{
#if defined(QT_SCRIPT_LIB)
QString program;
@ -928,14 +1001,16 @@ void MainWindow::load_script(QFileInfo info)
<< "Execution of script \""
<< filename << "\"\n";
evaluate_script(program, filename);
return true;
}
#endif
return false;
}
void MainWindow::on_actionLoad_Script_triggered()
{
#if defined(QT_SCRIPT_LIB)
QString filename = QFileDialog::getSaveFileName(
QString filename = QFileDialog::getOpenFileName(
this,
tr("Select a script to run..."),
".",

View File

@ -40,11 +40,6 @@ public:
MainWindow(QWidget* parent = 0);
~MainWindow();
public slots:
void updateViewerBBox();
void open(QString);
/// Find an IO plugin.
/// @throws `std::invalid_argument` if no loader with that argument can be found
/// @returns the IO plugin associated with `loader_name`
@ -56,12 +51,22 @@ public slots:
/// `std::invalid_argument` if `fileinfo` specifies an invalid file
Scene_item* load_item(QFileInfo fileinfo, Polyhedron_demo_io_plugin_interface*);
public slots:
void updateViewerBBox();
void open(QString);
/// Open a file with a given loader, and return true iff it was successful.
///
/// This slot is for use by scripts.
bool open(QString filename, QString loader_name);
/// Reloads an item. Expects to be called by a QAction with the
/// index of the item to be reloaded as data attached to the action.
/// The index must identify a valid `Scene_item`.
void reload_item();
void load_script(QFileInfo);
bool load_script(QString filename);
bool load_script(QFileInfo);
void selectSceneItem(int i);
void showSelectedPoint(double, double, double);

Some files were not shown because too many files have changed in this diff Show More