mirror of https://github.com/CGAL/cgal
merge from next
This commit is contained in:
Sébastien Loriot
commit
ff0ae4ac7b
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
// Copyright (c) 2009 INRIA Sophia-Antipolis (France).
|
||||
// All rights reserved.
|
||||
//
|
||||
// This file is part of CGAL (www.cgal.org).
|
||||
// You can redistribute it and/or modify it under the terms of the GNU
|
||||
// General Public License as published by the Free Software Foundation,
|
||||
// either version 3 of the License, or (at your option) any later version.
|
||||
// This file is part of CGAL (www.cgal.org).
|
||||
// You can redistribute it and/or modify it under the terms of the GNU
|
||||
// General Public License as published by the Free Software Foundation,
|
||||
// either version 3 of the License, or (at your option) any later version.
|
||||
//
|
||||
// Licensees holding a valid commercial license may use this file in
|
||||
// accordance with the commercial license agreement provided with the software.
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
// Copyright (c) 2009 INRIA Sophia-Antipolis (France).
|
||||
// All rights reserved.
|
||||
//
|
||||
// This file is part of CGAL (www.cgal.org).
|
||||
// You can redistribute it and/or modify it under the terms of the GNU
|
||||
// General Public License as published by the Free Software Foundation,
|
||||
// either version 3 of the License, or (at your option) any later version.
|
||||
// This file is part of CGAL (www.cgal.org).
|
||||
// You can redistribute it and/or modify it under the terms of the GNU
|
||||
// General Public License as published by the Free Software Foundation,
|
||||
// either version 3 of the License, or (at your option) any later version.
|
||||
//
|
||||
// Licensees holding a valid commercial license may use this file in
|
||||
// accordance with the commercial license agreement provided with the software.
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
// Copyright (c) 2009 INRIA Sophia-Antipolis (France).
|
||||
// All rights reserved.
|
||||
//
|
||||
// This file is part of CGAL (www.cgal.org).
|
||||
// You can redistribute it and/or modify it under the terms of the GNU
|
||||
// General Public License as published by the Free Software Foundation,
|
||||
// either version 3 of the License, or (at your option) any later version.
|
||||
// This file is part of CGAL (www.cgal.org).
|
||||
// You can redistribute it and/or modify it under the terms of the GNU
|
||||
// General Public License as published by the Free Software Foundation,
|
||||
// either version 3 of the License, or (at your option) any later version.
|
||||
//
|
||||
// Licensees holding a valid commercial license may use this file in
|
||||
// accordance with the commercial license agreement provided with the software.
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
// Copyright (c) 2009 INRIA Sophia-Antipolis (France).
|
||||
// All rights reserved.
|
||||
//
|
||||
// This file is part of CGAL (www.cgal.org).
|
||||
// You can redistribute it and/or modify it under the terms of the GNU
|
||||
// General Public License as published by the Free Software Foundation,
|
||||
// either version 3 of the License, or (at your option) any later version.
|
||||
// This file is part of CGAL (www.cgal.org).
|
||||
// You can redistribute it and/or modify it under the terms of the GNU
|
||||
// General Public License as published by the Free Software Foundation,
|
||||
// either version 3 of the License, or (at your option) any later version.
|
||||
//
|
||||
// Licensees holding a valid commercial license may use this file in
|
||||
// accordance with the commercial license agreement provided with the software.
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
// Copyright (c) 2009 INRIA Sophia-Antipolis (France).
|
||||
// All rights reserved.
|
||||
//
|
||||
// This file is part of CGAL (www.cgal.org).
|
||||
// You can redistribute it and/or modify it under the terms of the GNU
|
||||
// General Public License as published by the Free Software Foundation,
|
||||
// either version 3 of the License, or (at your option) any later version.
|
||||
// This file is part of CGAL (www.cgal.org).
|
||||
// You can redistribute it and/or modify it under the terms of the GNU
|
||||
// General Public License as published by the Free Software Foundation,
|
||||
// either version 3 of the License, or (at your option) any later version.
|
||||
//
|
||||
// Licensees holding a valid commercial license may use this file in
|
||||
// accordance with the commercial license agreement provided with the software.
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
// Copyright (c) 2009 INRIA Sophia-Antipolis (France).
|
||||
// All rights reserved.
|
||||
//
|
||||
// This file is part of CGAL (www.cgal.org).
|
||||
// You can redistribute it and/or modify it under the terms of the GNU
|
||||
// General Public License as published by the Free Software Foundation,
|
||||
// either version 3 of the License, or (at your option) any later version.
|
||||
// This file is part of CGAL (www.cgal.org).
|
||||
// You can redistribute it and/or modify it under the terms of the GNU
|
||||
// General Public License as published by the Free Software Foundation,
|
||||
// either version 3 of the License, or (at your option) any later version.
|
||||
//
|
||||
// Licensees holding a valid commercial license may use this file in
|
||||
// accordance with the commercial license agreement provided with the software.
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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 )
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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(),
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -111,24 +111,24 @@ public:
|
|||
#endif
|
||||
#endif
|
||||
|
||||
/*! \class
|
||||
* Inner class Data derived from Rep class
|
||||
*/
|
||||
class Data : public Rep
|
||||
{
|
||||
friend class Td_active_edge<Td_traits_>;
|
||||
|
||||
public:
|
||||
//c'tors
|
||||
Data (Halfedge_const_handle _he,
|
||||
const Td_map_item& _next,
|
||||
Dag_node* _p_node)
|
||||
: he(_he),next(_next),p_node(_p_node)
|
||||
{ }
|
||||
|
||||
~Data() { }
|
||||
|
||||
protected:
|
||||
/*! \class
|
||||
* Inner class Data derived from Rep class
|
||||
*/
|
||||
class Data : public Rep
|
||||
{
|
||||
friend class Td_active_edge<Td_traits_>;
|
||||
|
||||
public:
|
||||
//c'tors
|
||||
Data (Halfedge_const_handle _he,
|
||||
const Td_map_item& _next,
|
||||
Dag_node* _p_node)
|
||||
: he(_he),next(_next),p_node(_p_node)
|
||||
{ }
|
||||
|
||||
~Data() { }
|
||||
|
||||
protected:
|
||||
Halfedge_const_handle he;
|
||||
Td_map_item next;
|
||||
Dag_node* p_node;
|
||||
|
|
|
|||
|
|
@ -115,24 +115,24 @@ public:
|
|||
#endif
|
||||
#endif
|
||||
|
||||
/*! \class
|
||||
* Inner class Data derived from Rep class
|
||||
*/
|
||||
class Data : public Rep
|
||||
{
|
||||
friend class Td_active_fictitious_vertex<Td_traits_>;
|
||||
|
||||
public:
|
||||
//c'tors
|
||||
Data (Vertex_const_handle _v,
|
||||
Halfedge_const_handle _cw_he,
|
||||
Dag_node* _p_node)
|
||||
: v(_v),cw_he(_cw_he),p_node(_p_node)
|
||||
{ }
|
||||
|
||||
~Data() { }
|
||||
|
||||
protected:
|
||||
/*! \class
|
||||
* Inner class Data derived from Rep class
|
||||
*/
|
||||
class Data : public Rep
|
||||
{
|
||||
friend class Td_active_fictitious_vertex<Td_traits_>;
|
||||
|
||||
public:
|
||||
//c'tors
|
||||
Data (Vertex_const_handle _v,
|
||||
Halfedge_const_handle _cw_he,
|
||||
Dag_node* _p_node)
|
||||
: v(_v),cw_he(_cw_he),p_node(_p_node)
|
||||
{ }
|
||||
|
||||
~Data() { }
|
||||
|
||||
protected:
|
||||
Vertex_const_handle v;
|
||||
Halfedge_const_handle cw_he; //holds the first edge going cw starting at 12 o'clock
|
||||
Dag_node* p_node;
|
||||
|
|
|
|||
|
|
@ -115,24 +115,24 @@ class Td_active_vertex : public Handle
|
|||
#endif
|
||||
#endif
|
||||
|
||||
/*! \class
|
||||
* Inner class Data derived from Rep class
|
||||
*/
|
||||
class Data : public Rep
|
||||
{
|
||||
friend class Td_active_vertex<Td_traits_>;
|
||||
|
||||
public:
|
||||
//c'tors
|
||||
Data (Vertex_const_handle _v,
|
||||
Halfedge_const_handle _cw_he,
|
||||
Dag_node* _p_node)
|
||||
: v(_v),cw_he(_cw_he),p_node(_p_node)
|
||||
{ }
|
||||
|
||||
~Data() { }
|
||||
|
||||
protected:
|
||||
/*! \class
|
||||
* Inner class Data derived from Rep class
|
||||
*/
|
||||
class Data : public Rep
|
||||
{
|
||||
friend class Td_active_vertex<Td_traits_>;
|
||||
|
||||
public:
|
||||
//c'tors
|
||||
Data (Vertex_const_handle _v,
|
||||
Halfedge_const_handle _cw_he,
|
||||
Dag_node* _p_node)
|
||||
: v(_v),cw_he(_cw_he),p_node(_p_node)
|
||||
{ }
|
||||
|
||||
~Data() { }
|
||||
|
||||
protected:
|
||||
Vertex_const_handle v;
|
||||
Halfedge_const_handle cw_he; //holds the first edge going cw starting at 12 o'clock
|
||||
Dag_node* p_node;
|
||||
|
|
|
|||
|
|
@ -73,10 +73,10 @@ public:
|
|||
//type of Td_dag_node (Self)
|
||||
typedef Td_dag_node<Traits> Self;
|
||||
|
||||
//type of td_map_item
|
||||
typedef typename Traits::Td_map_item Td_map_item;
|
||||
|
||||
//type of Td_active_trapezoid
|
||||
//type of td_map_item
|
||||
typedef typename Traits::Td_map_item Td_map_item;
|
||||
|
||||
//type of Td_active_trapezoid
|
||||
typedef typename Traits::Td_active_trapezoid Td_active_trapezoid;
|
||||
|
||||
#ifndef CGAL_CFG_USING_BASE_MEMBER_BUG_2
|
||||
|
|
@ -100,19 +100,19 @@ protected:
|
|||
|
||||
public:
|
||||
|
||||
class clear_neighbors_visitor : public boost::static_visitor< void >
|
||||
{
|
||||
public:
|
||||
void operator()(Td_active_trapezoid& t) const
|
||||
{
|
||||
t.clear_neighbors();
|
||||
}
|
||||
|
||||
template < typename Tp >
|
||||
void operator()(Tp& t) const
|
||||
{
|
||||
}
|
||||
|
||||
class clear_neighbors_visitor : public boost::static_visitor< void >
|
||||
{
|
||||
public:
|
||||
void operator()(Td_active_trapezoid& t) const
|
||||
{
|
||||
t.clear_neighbors();
|
||||
}
|
||||
|
||||
template < typename Tp >
|
||||
void operator()(Tp& t) const
|
||||
{
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
//c'tors
|
||||
|
|
|
|||
|
|
@ -111,22 +111,22 @@ public:
|
|||
#endif
|
||||
#endif
|
||||
|
||||
/*! \class
|
||||
* Inner class Data derived from Rep class
|
||||
*/
|
||||
class Data : public Rep
|
||||
{
|
||||
friend class Td_inactive_edge<Td_traits_>;
|
||||
|
||||
public:
|
||||
//c'tors
|
||||
Data (boost::shared_ptr<X_monotone_curve_2>& _cv, Dag_node* _p_node)
|
||||
: cv(_cv), p_node(_p_node) //, lb(_lb),lt(_lt),rb(_rb),rt(_rt)
|
||||
{ }
|
||||
|
||||
~Data() { }
|
||||
|
||||
protected:
|
||||
/*! \class
|
||||
* Inner class Data derived from Rep class
|
||||
*/
|
||||
class Data : public Rep
|
||||
{
|
||||
friend class Td_inactive_edge<Td_traits_>;
|
||||
|
||||
public:
|
||||
//c'tors
|
||||
Data (boost::shared_ptr<X_monotone_curve_2>& _cv, Dag_node* _p_node)
|
||||
: cv(_cv), p_node(_p_node) //, lb(_lb),lt(_lt),rb(_rb),rt(_rt)
|
||||
{ }
|
||||
|
||||
~Data() { }
|
||||
|
||||
protected:
|
||||
boost::shared_ptr<X_monotone_curve_2> cv;
|
||||
Dag_node* p_node;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -114,23 +114,23 @@ public:
|
|||
#endif
|
||||
#endif
|
||||
|
||||
/*! \class
|
||||
* Inner class Data derived from Rep class
|
||||
*/
|
||||
class Data : public Rep
|
||||
{
|
||||
friend class Td_inactive_fictitious_vertex<Td_traits_>;
|
||||
|
||||
public:
|
||||
//c'tors
|
||||
Data (const X_monotone_curve_2& _cv,
|
||||
Arr_curve_end _ce,
|
||||
Dag_node* _p_node): cv(_cv),ce(_ce),p_node(_p_node)
|
||||
{ }
|
||||
|
||||
~Data() { }
|
||||
|
||||
protected:
|
||||
/*! \class
|
||||
* Inner class Data derived from Rep class
|
||||
*/
|
||||
class Data : public Rep
|
||||
{
|
||||
friend class Td_inactive_fictitious_vertex<Td_traits_>;
|
||||
|
||||
public:
|
||||
//c'tors
|
||||
Data (const X_monotone_curve_2& _cv,
|
||||
Arr_curve_end _ce,
|
||||
Dag_node* _p_node): cv(_cv),ce(_ce),p_node(_p_node)
|
||||
{ }
|
||||
|
||||
~Data() { }
|
||||
|
||||
protected:
|
||||
X_monotone_curve_2 cv;
|
||||
Arr_curve_end ce;
|
||||
Dag_node* p_node;
|
||||
|
|
|
|||
|
|
@ -110,21 +110,21 @@ public:
|
|||
#endif
|
||||
#endif
|
||||
|
||||
/*! \class
|
||||
* Inner class Data derived from Rep class
|
||||
*/
|
||||
class Data : public Rep
|
||||
{
|
||||
friend class Td_inactive_vertex<Td_traits_>;
|
||||
|
||||
public:
|
||||
//c'tors
|
||||
Data (Point _p, Dag_node* _p_node): p(_p),p_node(_p_node)
|
||||
{ }
|
||||
|
||||
~Data() { }
|
||||
|
||||
protected:
|
||||
/*! \class
|
||||
* Inner class Data derived from Rep class
|
||||
*/
|
||||
class Data : public Rep
|
||||
{
|
||||
friend class Td_inactive_vertex<Td_traits_>;
|
||||
|
||||
public:
|
||||
//c'tors
|
||||
Data (Point _p, Dag_node* _p_node): p(_p),p_node(_p_node)
|
||||
{ }
|
||||
|
||||
~Data() { }
|
||||
|
||||
protected:
|
||||
Point p;
|
||||
Dag_node* p_node;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
// Copyright (c) 2009,2010,2011 Tel-Aviv University (Israel).
|
||||
// All rights reserved.
|
||||
//
|
||||
// This file is part of CGAL (www.cgal.org).
|
||||
// You can redistribute it and/or modify it under the terms of the GNU
|
||||
// General Public License as published by the Free Software Foundation,
|
||||
// either version 3 of the License, or (at your option) any later version.
|
||||
// This file is part of CGAL (www.cgal.org).
|
||||
// You can redistribute it and/or modify it under the terms of the GNU
|
||||
// General Public License as published by the Free Software Foundation,
|
||||
// either version 3 of the License, or (at your option) any later version.
|
||||
//
|
||||
// Licensees holding a valid commercial license may use this file in
|
||||
// accordance with the commercial license agreement provided with the software.
|
||||
|
|
@ -35,4 +35,4 @@ class Arr_on_sphere_transformation
|
|||
|
||||
} //namespace CGAL
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
// Copyright (c) 2009,2010,2011 Tel-Aviv University (Israel).
|
||||
// All rights reserved.
|
||||
//
|
||||
// This file is part of CGAL (www.cgal.org).
|
||||
// You can redistribute it and/or modify it under the terms of the GNU
|
||||
// General Public License as published by the Free Software Foundation,
|
||||
// either version 3 of the License, or (at your option) any later version.
|
||||
// This file is part of CGAL (www.cgal.org).
|
||||
// You can redistribute it and/or modify it under the terms of the GNU
|
||||
// General Public License as published by the Free Software Foundation,
|
||||
// either version 3 of the License, or (at your option) any later version.
|
||||
//
|
||||
// Licensees holding a valid commercial license may use this file in
|
||||
// accordance with the commercial license agreement provided with the software.
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
// Copyright (c) 2009,2010,2011 Tel-Aviv University (Israel).
|
||||
// All rights reserved.
|
||||
//
|
||||
// This file is part of CGAL (www.cgal.org).
|
||||
// You can redistribute it and/or modify it under the terms of the GNU
|
||||
// General Public License as published by the Free Software Foundation,
|
||||
// either version 3 of the License, or (at your option) any later version.
|
||||
// This file is part of CGAL (www.cgal.org).
|
||||
// You can redistribute it and/or modify it under the terms of the GNU
|
||||
// General Public License as published by the Free Software Foundation,
|
||||
// either version 3 of the License, or (at your option) any later version.
|
||||
//
|
||||
// Licensees holding a valid commercial license may use this file in
|
||||
// accordance with the commercial license agreement provided with the software.
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -1,27 +1,27 @@
|
|||
// Copyright (c) 2009 GeometryFactory Sarl (France).
|
||||
// All rights reserved.
|
||||
//
|
||||
// Copyright (c) 2009 GeometryFactory Sarl (France).
|
||||
// All rights reserved.
|
||||
//
|
||||
// This file is part of CGAL (www.cgal.org).
|
||||
// You can redistribute it and/or modify it under the terms of the GNU
|
||||
// General Public License as published by the Free Software Foundation,
|
||||
// either version 3 of the License, or (at your option) any later version.
|
||||
//
|
||||
// Licensees holding a valid commercial license may use this file in
|
||||
// accordance with the commercial license agreement provided with the software.
|
||||
//
|
||||
// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
|
||||
// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
||||
//
|
||||
// $URL$
|
||||
// $Id$
|
||||
//
|
||||
//
|
||||
// Author(s) : Fernando Cacciola <fernando.cacciola@geometryfactory.com>
|
||||
|
||||
#ifndef CGAL_QT_BEZIER_CURVES_H
|
||||
#define CGAL_QT_BEZIER_CURVES_H
|
||||
|
||||
#include <CGAL/value_type_traits.h>
|
||||
//
|
||||
// Licensees holding a valid commercial license may use this file in
|
||||
// accordance with the commercial license agreement provided with the software.
|
||||
//
|
||||
// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
|
||||
// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
||||
//
|
||||
// $URL$
|
||||
// $Id$
|
||||
//
|
||||
//
|
||||
// Author(s) : Fernando Cacciola <fernando.cacciola@geometryfactory.com>
|
||||
|
||||
#ifndef CGAL_QT_BEZIER_CURVES_H
|
||||
#define CGAL_QT_BEZIER_CURVES_H
|
||||
|
||||
#include <CGAL/value_type_traits.h>
|
||||
#include <CGAL/Qt/PiecewiseSetGraphicsItem.h>
|
||||
#include <CGAL/Qt/BoundaryPiecesGraphicsItem.h>
|
||||
#include <CGAL/Qt/Converter.h>
|
||||
|
|
@ -31,11 +31,11 @@
|
|||
namespace CGAL {
|
||||
|
||||
namespace Qt {
|
||||
|
||||
|
||||
struct Bezier_helper
|
||||
{
|
||||
template<class OPoint, class IPoint> static OPoint cvtp2 ( IPoint const& p ) { return OPoint( to_double(p.x()), to_double(p.y()) ) ; }
|
||||
|
||||
{
|
||||
template<class OPoint, class IPoint> static OPoint cvtp2 ( IPoint const& p ) { return OPoint( to_double(p.x()), to_double(p.y()) ) ; }
|
||||
|
||||
template<class Bezier_point>
|
||||
static Point_2< Simple_cartesian<double> > refine_bezier_point ( Bezier_point const& aP, double aError = 1e-2 )
|
||||
{
|
||||
|
|
@ -43,48 +43,48 @@ struct Bezier_helper
|
|||
typedef typename Bounding_traits::NT NT ;
|
||||
|
||||
NT min_x, min_y, max_x, max_y ;
|
||||
|
||||
NT const error(aError);
|
||||
|
||||
bool lCanRefine = true ;
|
||||
|
||||
NT const error(aError);
|
||||
|
||||
bool lCanRefine = true ;
|
||||
|
||||
do
|
||||
{
|
||||
aP.get_bbox (min_x, min_y, max_x, max_y);
|
||||
|
||||
lCanRefine = !aP.is_exact() && ( CGAL_NTS abs( max_x - min_x) > error || CGAL_NTS abs( max_y - min_y ) > error ) ;
|
||||
if ( lCanRefine )
|
||||
lCanRefine = !aP.is_exact() && ( CGAL_NTS abs( max_x - min_x) > error || CGAL_NTS abs( max_y - min_y ) > error ) ;
|
||||
if ( lCanRefine )
|
||||
lCanRefine = aP.refine();
|
||||
}
|
||||
while ( lCanRefine ) ;
|
||||
|
||||
NT const two(2.0);
|
||||
while ( lCanRefine ) ;
|
||||
|
||||
NT const two(2.0);
|
||||
|
||||
double x = to_double( ( min_x + max_x ) / two ) ;
|
||||
double y = to_double( ( min_y + max_y ) / two ) ;
|
||||
|
||||
return Point_2< Simple_cartesian<double> >(x,y);
|
||||
}
|
||||
|
||||
|
||||
template<class Bezier_point, class Bezier_curve>
|
||||
static typename Bezier_point::Bez_point_bound::NT get_endpoint_parameter( Bezier_point const& aP, Bezier_curve const& aCurve, unsigned int aXID )
|
||||
{
|
||||
typedef typename Bezier_point::Originator_iterator Originator_iterator ;
|
||||
|
||||
Originator_iterator lOrg = aP.get_originator(aCurve, aXID);
|
||||
|
||||
typedef typename Bezier_point::Bez_point_bound::NT NT ;
|
||||
|
||||
refine_bezier_point(aP);
|
||||
|
||||
return ( lOrg->point_bound().t_min + lOrg->point_bound().t_max ) / NT(2.0);
|
||||
|
||||
typedef typename Bezier_point::Bez_point_bound::NT NT ;
|
||||
|
||||
refine_bezier_point(aP);
|
||||
|
||||
return ( lOrg->point_bound().t_min + lOrg->point_bound().t_max ) / NT(2.0);
|
||||
}
|
||||
|
||||
|
||||
template<class Ctrl_points, class FT>
|
||||
static void clip_impl ( Ctrl_points& rQ, FT aS, FT aT)
|
||||
{
|
||||
FT const zero(0.0);
|
||||
FT const one (1.0);
|
||||
FT const zero(0.0);
|
||||
FT const one (1.0);
|
||||
|
||||
if ( aS >= zero || aT <= one )
|
||||
{
|
||||
|
|
@ -109,9 +109,9 @@ struct Bezier_helper
|
|||
static void clip ( Bezier_X_monotone_curve const& aXMCurve, Ctrl_points& rQ )
|
||||
{
|
||||
|
||||
typedef typename Bezier_X_monotone_curve::Curve_2 Bezier_curve ;
|
||||
typedef typename Bezier_X_monotone_curve::Curve_2 Bezier_curve ;
|
||||
typedef typename Bezier_X_monotone_curve::Bounding_traits::NT BoundNT ;
|
||||
typedef typename Bezier_X_monotone_curve::Rat_kernel::Point_2 Rat_point_2 ;
|
||||
typedef typename Bezier_X_monotone_curve::Rat_kernel::Point_2 Rat_point_2 ;
|
||||
|
||||
Bezier_curve const& lBC = aXMCurve.supporting_curve();
|
||||
|
||||
|
|
@ -122,15 +122,15 @@ struct Bezier_helper
|
|||
|
||||
BoundNT lMin = lFwd ? lS : BoundNT(1.0) - lS ;
|
||||
BoundNT lMax = lFwd ? lT : BoundNT(1.0) - lT ;
|
||||
|
||||
std::copy( lBC.control_points_begin(), lBC.control_points_end(), std::back_inserter(rQ) ) ;
|
||||
if ( !lFwd )
|
||||
std::reverse(rQ.begin(), rQ.end());
|
||||
|
||||
std::copy( lBC.control_points_begin(), lBC.control_points_end(), std::back_inserter(rQ) ) ;
|
||||
if ( !lFwd )
|
||||
std::reverse(rQ.begin(), rQ.end());
|
||||
|
||||
clip_impl(rQ, lMin, lMax );
|
||||
clip_impl(rQ, lMin, lMax );
|
||||
}
|
||||
|
||||
|
||||
|
||||
template<class Control_point_in_iterator, class NT, class Control_point_out_iterator>
|
||||
static void recursive_subdivision( Control_point_in_iterator aBeginCtrlPts
|
||||
, Control_point_in_iterator aEndCtrlPts
|
||||
|
|
@ -217,7 +217,7 @@ struct Bezier_X_monotone_bbox
|
|||
template<class Bezier_X_monotone_curve>
|
||||
Bbox_2 operator()( Bezier_X_monotone_curve const& aBXMC ) const
|
||||
{
|
||||
typedef typename Bezier_X_monotone_curve::Rat_kernel::Point_2 Rat_point_2 ;
|
||||
typedef typename Bezier_X_monotone_curve::Rat_kernel::Point_2 Rat_point_2 ;
|
||||
std::vector<Rat_point_2> lQ ;
|
||||
Bezier_helper::clip(aBXMC,lQ);
|
||||
return CGAL::bbox_2(lQ.begin(), lQ.end());
|
||||
|
|
@ -229,9 +229,9 @@ struct Draw_bezier_curve
|
|||
template<class Bezier_curve, class Path>
|
||||
void operator()( Bezier_curve const& aBC, Path& aPath, int aIdx ) const
|
||||
{
|
||||
typedef typename Bezier_curve::Bounding_traits::NT BoundNT ;
|
||||
typedef typename Bezier_curve::Rat_kernel::Point_2 Rat_point_2 ;
|
||||
|
||||
typedef typename Bezier_curve::Bounding_traits::NT BoundNT ;
|
||||
typedef typename Bezier_curve::Rat_kernel::Point_2 Rat_point_2 ;
|
||||
|
||||
typedef std::vector<Rat_point_2> Rat_point_vector ;
|
||||
|
||||
typedef Simple_cartesian<double> Linear_kernel ;
|
||||
|
|
@ -291,19 +291,19 @@ struct Draw_bezier_X_monotone_curve
|
|||
template<class Bezier_X_monotone_curve, class Path>
|
||||
void operator()( Bezier_X_monotone_curve const& aBXMC, Path& aPath, int aIdx ) const
|
||||
{
|
||||
typedef typename Bezier_X_monotone_curve::Curve_2 Bezier_curve ;
|
||||
typedef typename Bezier_X_monotone_curve::Curve_2 Bezier_curve ;
|
||||
typedef typename Bezier_X_monotone_curve::Bounding_traits::NT BoundNT ;
|
||||
typedef typename Bezier_X_monotone_curve::Rat_kernel::Point_2 Rat_point_2 ;
|
||||
|
||||
typedef typename Bezier_X_monotone_curve::Rat_kernel::Point_2 Rat_point_2 ;
|
||||
|
||||
typedef std::vector<Rat_point_2> Rat_point_vector ;
|
||||
|
||||
|
||||
typedef Simple_cartesian<double> Linear_kernel ;
|
||||
|
||||
typedef Qt::Converter<Linear_kernel> Converter ;
|
||||
|
||||
typedef Point_2<Linear_kernel> Linear_point ;
|
||||
|
||||
typedef std::vector<Linear_point> Linear_point_vector ;
|
||||
typedef std::vector<Linear_point> Linear_point_vector ;
|
||||
|
||||
Rat_point_vector lQ ;
|
||||
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ class GpsCircleSegmentGraphicsItem : public GraphicsItem
|
|||
{
|
||||
typedef CS Circle_segment_2 ;
|
||||
|
||||
typedef Qt::Converter< Simple_cartesian<double> > Converter ;
|
||||
typedef Qt::Converter< Simple_cartesian<double> > Converter ;
|
||||
|
||||
public:
|
||||
|
||||
|
|
@ -121,7 +121,7 @@ GpsCircleSegmentGraphicsItem<CS>::paint(QPainter *painter,
|
|||
QWidget * widget)
|
||||
{
|
||||
painter->setPen(edgesPen());
|
||||
|
||||
|
||||
if ( !cs_.is_full() )
|
||||
{
|
||||
double sx = to_double(cs_.source().x());
|
||||
|
|
@ -135,7 +135,7 @@ GpsCircleSegmentGraphicsItem<CS>::paint(QPainter *painter,
|
|||
}
|
||||
else
|
||||
{
|
||||
double cx = to_double(cs_.supporting_circle().center().x());
|
||||
double cx = to_double(cs_.supporting_circle().center().x());
|
||||
double cy = to_double(cs_.supporting_circle().center().y());
|
||||
|
||||
double x0, y0, x1, y1 ;
|
||||
|
|
@ -172,12 +172,12 @@ GpsCircleSegmentGraphicsItem<CS>::paint(QPainter *painter,
|
|||
{
|
||||
if( cs_.orientation() != COLLINEAR)
|
||||
{
|
||||
double cx = to_double(cs_.supporting_circle().center().x());
|
||||
double cx = to_double(cs_.supporting_circle().center().x());
|
||||
double cy = to_double(cs_.supporting_circle().center().y());
|
||||
double rad = std::sqrt(CGAL::to_double(cs_.supporting_circle().squared_radius()));
|
||||
painter->drawArc(cx -rad, cy - rad, 2 * rad, 2 * rad, 0, 360*16);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
@ -192,7 +192,7 @@ GpsCircleSegmentGraphicsItem<CS>::updateBoundingBox()
|
|||
prepareGeometryChange();
|
||||
|
||||
if(cs_.is_circular())
|
||||
{
|
||||
{
|
||||
bounding_rect = convert(cs_.supporting_circle().bbox());
|
||||
}
|
||||
else
|
||||
|
|
@ -202,15 +202,15 @@ GpsCircleSegmentGraphicsItem<CS>::updateBoundingBox()
|
|||
double x_max = to_double(cs_.target().x());
|
||||
double y_max = to_double(cs_.target().y());
|
||||
|
||||
if(x_min > x_max)
|
||||
if(x_min > x_max)
|
||||
{
|
||||
std::swap(x_min, x_max);
|
||||
std::swap(y_min, y_max);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if(y_min > y_max)
|
||||
std::swap(y_min, y_max);
|
||||
|
||||
|
||||
bounding_rect = QRectF(x_min,y_min,x_max,y_max) ;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
// Copyright (c) 2009 GeometryFactory Sarl (France).
|
||||
// All rights reserved.
|
||||
//
|
||||
// This file is part of CGAL (www.cgal.org).
|
||||
// You can redistribute it and/or modify it under the terms of the GNU
|
||||
// General Public License as published by the Free Software Foundation,
|
||||
// either version 3 of the License, or (at your option) any later version.
|
||||
// This file is part of CGAL (www.cgal.org).
|
||||
// You can redistribute it and/or modify it under the terms of the GNU
|
||||
// General Public License as published by the Free Software Foundation,
|
||||
// either version 3 of the License, or (at your option) any later version.
|
||||
//
|
||||
// Licensees holding a valid commercial license may use this file in
|
||||
// accordance with the commercial license agreement provided with the software.
|
||||
|
|
|
|||
|
|
@ -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} )
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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()
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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());
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
// Copyright (c) 2009 INRIA Sophia-Antipolis (France).
|
||||
// All rights reserved.
|
||||
//
|
||||
// This file is part of CGAL (www.cgal.org).
|
||||
// You can redistribute it and/or modify it under the terms of the GNU
|
||||
// General Public License as published by the Free Software Foundation,
|
||||
// either version 3 of the License, or (at your option) any later version.
|
||||
// This file is part of CGAL (www.cgal.org).
|
||||
// You can redistribute it and/or modify it under the terms of the GNU
|
||||
// General Public License as published by the Free Software Foundation,
|
||||
// either version 3 of the License, or (at your option) any later version.
|
||||
//
|
||||
// Licensees holding a valid commercial license may use this file in
|
||||
// accordance with the commercial license agreement provided with the software.
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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})
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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.")
|
||||
|
|
|
|||
|
|
@ -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} )
|
||||
|
||||
|
|
|
|||
|
|
@ -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 )
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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} )
|
||||
|
|
|
|||
|
|
@ -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 )
|
||||
|
|
@ -22,7 +23,7 @@ macro(create_single_source_cgal_program_qt4 first )
|
|||
add_executable(${exe_name} ${all})
|
||||
|
||||
add_to_cached_list( CGAL_EXECUTABLE_TARGETS ${exe_name} )
|
||||
|
||||
|
||||
# Link the executable to CGAL and third-party libraries
|
||||
if ( CGAL_AUTO_LINK_ENABLED )
|
||||
|
||||
|
|
|
|||
|
|
@ -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()
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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} )
|
||||
|
|
|
|||
|
|
@ -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} )
|
||||
|
|
|
|||
|
|
@ -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} )
|
||||
|
|
|
|||
|
|
@ -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} )
|
||||
|
|
|
|||
|
|
@ -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} )
|
||||
|
|
|
|||
|
|
@ -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} )
|
||||
|
||||
|
|
|
|||
|
|
@ -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 )
|
||||
|
|
|
|||
|
|
@ -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" )
|
||||
|
|
|
|||
|
|
@ -227,4 +227,4 @@ if ( UNIT_TEST_VERSION_UTILS )
|
|||
|
||||
endif()
|
||||
|
||||
endif()
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
# Try to find the GMP libraries
|
||||
# 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_IN_CGAL_AUXILIARY - TRUE if the GMP found is the one distributed with CGAL in the auxiliary folder
|
||||
# - 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 - 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
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
# Try to find the GMPXX libraries
|
||||
# GMPXX_FOUND - system has GMPXX lib
|
||||
# GMPXX_INCLUDE_DIR - the GMPXX include directory
|
||||
# GMPXX_LIBRARIES - Libraries needed to use GMPXX
|
||||
# - 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
|
||||
|
||||
# TODO: support Windows and MacOSX
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ endif()
|
|||
if( MPFI_FOUND )
|
||||
|
||||
include( CGAL_VersionUtils )
|
||||
include( ${MPFI_USE_FILE} )
|
||||
|
||||
find_path(RS_INCLUDE_DIR
|
||||
NAMES rs_exports.h
|
||||
|
|
|
|||
|
|
@ -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 )
|
||||
|
|
|
|||
|
|
@ -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} )
|
||||
|
|
|
|||
|
|
@ -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} )
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
||||
|
|
|
|||
|
|
@ -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})
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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));
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -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
|
||||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
CGAL-4.1-dev
|
||||
CGAL-4.1-alpha1
|
||||
|
|
|
|||
|
|
@ -205,4 +205,4 @@ package Mail::Sender;
|
|||
|
||||
1;
|
||||
|
||||
# list of extensions by "Guillaume A." <webmaster@patchworks-et-boutons.com>
|
||||
# list of extensions by "Guillaume A." <webmaster@patchworks-et-boutons.com>
|
||||
|
|
|
|||
|
|
@ -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 =
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
|
|
|||
|
|
@ -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!! */
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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 =
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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 )
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue