diff --git a/.gitattributes b/.gitattributes index b0fc43975df..5953c65bfe3 100644 --- a/.gitattributes +++ b/.gitattributes @@ -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 diff --git a/.gitignore b/.gitignore index 5614d5cc13d..56eae683938 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/AABB_tree/test/AABB_tree/AABB_test_util.h b/AABB_tree/test/AABB_tree/AABB_test_util.h index d14f73ae499..a7b8ac34d09 100644 --- a/AABB_tree/test/AABB_tree/AABB_test_util.h +++ b/AABB_tree/test/AABB_tree/AABB_test_util.h @@ -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. diff --git a/AABB_tree/test/AABB_tree/aabb_correctness_triangle_test.cpp b/AABB_tree/test/AABB_tree/aabb_correctness_triangle_test.cpp index 3d196c4ec2a..d290953a117 100644 --- a/AABB_tree/test/AABB_tree/aabb_correctness_triangle_test.cpp +++ b/AABB_tree/test/AABB_tree/aabb_correctness_triangle_test.cpp @@ -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. diff --git a/AABB_tree/test/AABB_tree/aabb_distance_edge_test.cpp b/AABB_tree/test/AABB_tree/aabb_distance_edge_test.cpp index fa6bd21f34a..31dfcc77e82 100644 --- a/AABB_tree/test/AABB_tree/aabb_distance_edge_test.cpp +++ b/AABB_tree/test/AABB_tree/aabb_distance_edge_test.cpp @@ -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. diff --git a/AABB_tree/test/AABB_tree/aabb_distance_triangle_hint_test.cpp b/AABB_tree/test/AABB_tree/aabb_distance_triangle_hint_test.cpp index 001b66c0d3f..a1f0c66926c 100644 --- a/AABB_tree/test/AABB_tree/aabb_distance_triangle_hint_test.cpp +++ b/AABB_tree/test/AABB_tree/aabb_distance_triangle_hint_test.cpp @@ -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. diff --git a/AABB_tree/test/AABB_tree/aabb_distance_triangle_test.cpp b/AABB_tree/test/AABB_tree/aabb_distance_triangle_test.cpp index 0274785b5f3..0ed5a0a1b23 100644 --- a/AABB_tree/test/AABB_tree/aabb_distance_triangle_test.cpp +++ b/AABB_tree/test/AABB_tree/aabb_distance_triangle_test.cpp @@ -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. diff --git a/AABB_tree/test/AABB_tree/aabb_intersection_triangle_test.cpp b/AABB_tree/test/AABB_tree/aabb_intersection_triangle_test.cpp index c7c5c1641bd..b5086870fab 100644 --- a/AABB_tree/test/AABB_tree/aabb_intersection_triangle_test.cpp +++ b/AABB_tree/test/AABB_tree/aabb_intersection_triangle_test.cpp @@ -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. diff --git a/Algebraic_foundations/include/CGAL/Algebraic_structure_traits.h b/Algebraic_foundations/include/CGAL/Algebraic_structure_traits.h index 00d3252e995..76a0b601e58 100644 --- a/Algebraic_foundations/include/CGAL/Algebraic_structure_traits.h +++ b/Algebraic_foundations/include/CGAL/Algebraic_structure_traits.h @@ -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 AST; + CGAL_precondition_code( typedef Algebraic_structure_traits 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 AST; + CGAL_precondition_code(typedef Algebraic_structure_traits AST); CGAL_precondition( typename AST::Is_zero()(x) == false ); q = y/x; return true; diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Descartes.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Descartes.h index b332f71af2e..cc38633528f 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Descartes.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Descartes.h @@ -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; diff --git a/Algebraic_kernel_d/test/Algebraic_kernel_d/CMakeLists.txt b/Algebraic_kernel_d/test/Algebraic_kernel_d/CMakeLists.txt index 1f85c4cf186..034c50d5f1a 100644 --- a/Algebraic_kernel_d/test/Algebraic_kernel_d/CMakeLists.txt +++ b/Algebraic_kernel_d/test/Algebraic_kernel_d/CMakeLists.txt @@ -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 ) diff --git a/Algebraic_kernel_for_circles/include/CGAL/Algebraic_kernel_for_circles/internal_functions_on_roots_and_polynomial_1_2_and_2_2.h b/Algebraic_kernel_for_circles/include/CGAL/Algebraic_kernel_for_circles/internal_functions_on_roots_and_polynomial_1_2_and_2_2.h index 99dabb56957..e15371d58ba 100644 --- a/Algebraic_kernel_for_circles/include/CGAL/Algebraic_kernel_for_circles/internal_functions_on_roots_and_polynomial_1_2_and_2_2.h +++ b/Algebraic_kernel_for_circles/include/CGAL/Algebraic_kernel_for_circles/internal_functions_on_roots_and_polynomial_1_2_and_2_2.h @@ -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; diff --git a/Algebraic_kernel_for_circles/include/CGAL/Algebraic_kernel_for_circles/internal_functions_on_roots_and_polynomials_2_2.h b/Algebraic_kernel_for_circles/include/CGAL/Algebraic_kernel_for_circles/internal_functions_on_roots_and_polynomials_2_2.h index 69e4a9700d1..8dcacbe07c3 100644 --- a/Algebraic_kernel_for_circles/include/CGAL/Algebraic_kernel_for_circles/internal_functions_on_roots_and_polynomials_2_2.h +++ b/Algebraic_kernel_for_circles/include/CGAL/Algebraic_kernel_for_circles/internal_functions_on_roots_and_polynomials_2_2.h @@ -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(), diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Apollonius_graph_2_impl.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Apollonius_graph_2_impl.h index 63d6b403000..efc735abe4f 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Apollonius_graph_2_impl.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Apollonius_graph_2_impl.h @@ -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 Hyperbola_segment; + // typedef CGAL::Hyperbola_segment_2 Hyperbola_segment; typedef CGAL::Parabola_segment_2 Parabola_segment; // typedef typename Geom_traits::Hyperbola_segment_2 Hyperbola_segment; // typedef typename Geom_traits::Parabola_segment_2 Parabola_segment; diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_active_edge.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_active_edge.h index 7a5de53d058..9be7c08042e 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_active_edge.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_active_edge.h @@ -111,24 +111,24 @@ public: #endif #endif - /*! \class - * Inner class Data derived from Rep class - */ - class Data : public Rep - { - friend class Td_active_edge; - - 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; + + 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; diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_active_fictitious_vertex.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_active_fictitious_vertex.h index eaaad1da7ca..9c357522fd7 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_active_fictitious_vertex.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_active_fictitious_vertex.h @@ -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; - - 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; + + 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; diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_active_vertex.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_active_vertex.h index 1b3ac6bf7f7..9070c072f79 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_active_vertex.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_active_vertex.h @@ -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; - - 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; + + 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; diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_dag_node.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_dag_node.h index 7e0237cb3a8..81fc56b79b7 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_dag_node.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_dag_node.h @@ -73,10 +73,10 @@ public: //type of Td_dag_node (Self) typedef Td_dag_node 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 diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_inactive_edge.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_inactive_edge.h index 2f143a82f7d..c122c97f2b2 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_inactive_edge.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_inactive_edge.h @@ -111,22 +111,22 @@ public: #endif #endif - /*! \class - * Inner class Data derived from Rep class - */ - class Data : public Rep - { - friend class Td_inactive_edge; - - public: - //c'tors - Data (boost::shared_ptr& _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; + + public: + //c'tors + Data (boost::shared_ptr& _cv, Dag_node* _p_node) + : cv(_cv), p_node(_p_node) //, lb(_lb),lt(_lt),rb(_rb),rt(_rt) + { } + + ~Data() { } + + protected: boost::shared_ptr cv; Dag_node* p_node; }; diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_inactive_fictitious_vertex.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_inactive_fictitious_vertex.h index fd72a5795e7..82b890e5972 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_inactive_fictitious_vertex.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_inactive_fictitious_vertex.h @@ -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; - - 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; + + 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; diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_inactive_vertex.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_inactive_vertex.h index 99195e649d8..14162e6f361 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_inactive_vertex.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_inactive_vertex.h @@ -110,21 +110,21 @@ public: #endif #endif - /*! \class - * Inner class Data derived from Rep class - */ - class Data : public Rep - { - friend class Td_inactive_vertex; - - 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; + + public: + //c'tors + Data (Point _p, Dag_node* _p_node): p(_p),p_node(_p_node) + { } + + ~Data() { } + + protected: Point p; Dag_node* p_node; }; diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_on_sphere_transformation.h b/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_on_sphere_transformation.h index 7a5ad318bcf..e81cec26ca2 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_on_sphere_transformation.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_on_sphere_transformation.h @@ -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 diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_polyhedral_sgm_transformation.h b/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_polyhedral_sgm_transformation.h index 552e68fafc4..f8fcfb461e0 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_polyhedral_sgm_transformation.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_polyhedral_sgm_transformation.h @@ -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. diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_transform_on_sphere.h b/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_transform_on_sphere.h index 03394b76ac4..c9004d9e1f7 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_transform_on_sphere.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_spherical_gaussian_map_3/Arr_transform_on_sphere.h @@ -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. diff --git a/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_on_surface_2_global.h b/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_on_surface_2_global.h index 9bc0abe79e9..28584dddfec 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_on_surface_2_global.h +++ b/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_on_surface_2_global.h @@ -214,7 +214,6 @@ void insert (Arrangement_on_surface_2& arr, const Curve& c, const PointLocation& pl, typename PointLocation::Point_2*) { - typedef Arrangement_on_surface_2 Arr; typedef typename TopTraits::Zone_insertion_visitor Zone_visitor; Zone_visitor visitor; @@ -1184,7 +1183,6 @@ bool is_valid (const Arrangement_on_surface_2& arr) typedef Arrangement_on_surface_2 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& 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& arr, const typename GeomTraits::X_monotone_curve_2& c, OutputIterator oi) { - typedef Arrangement_on_surface_2 - 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 bool do_intersect (Arrangement_on_surface_2& arr, const Curve& c) { - typedef Arrangement_on_surface_2 - 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); diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_2_utils.h b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_2_utils.h index 410645ca13e..69957b25131 100644 --- a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_2_utils.h +++ b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_2_utils.h @@ -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; diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_overlay.cpp b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_overlay.cpp index 2936d429b88..8d6fc967514 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_overlay.cpp +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_overlay.cpp @@ -26,6 +26,7 @@ #include #include #include +#include #include #include diff --git a/Boolean_set_operations_2/demo/Boolean_set_operations_2_GraphicsView/include/CGAL/Qt/BezierCurves.h b/Boolean_set_operations_2/demo/Boolean_set_operations_2_GraphicsView/include/CGAL/Qt/BezierCurves.h index 626d80a8b48..5f1880fb015 100644 --- a/Boolean_set_operations_2/demo/Boolean_set_operations_2_GraphicsView/include/CGAL/Qt/BezierCurves.h +++ b/Boolean_set_operations_2/demo/Boolean_set_operations_2_GraphicsView/include/CGAL/Qt/BezierCurves.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 - -#ifndef CGAL_QT_BEZIER_CURVES_H -#define CGAL_QT_BEZIER_CURVES_H - -#include +// +// 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 + +#ifndef CGAL_QT_BEZIER_CURVES_H +#define CGAL_QT_BEZIER_CURVES_H + +#include #include #include #include @@ -31,11 +31,11 @@ namespace CGAL { namespace Qt { - + struct Bezier_helper -{ - template static OPoint cvtp2 ( IPoint const& p ) { return OPoint( to_double(p.x()), to_double(p.y()) ) ; } - +{ + template static OPoint cvtp2 ( IPoint const& p ) { return OPoint( to_double(p.x()), to_double(p.y()) ) ; } + template static Point_2< Simple_cartesian > 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 >(x,y); } - + template 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 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 static void recursive_subdivision( Control_point_in_iterator aBeginCtrlPts , Control_point_in_iterator aEndCtrlPts @@ -217,7 +217,7 @@ struct Bezier_X_monotone_bbox template 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 lQ ; Bezier_helper::clip(aBXMC,lQ); return CGAL::bbox_2(lQ.begin(), lQ.end()); @@ -229,9 +229,9 @@ struct Draw_bezier_curve template 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_vector ; typedef Simple_cartesian Linear_kernel ; @@ -291,19 +291,19 @@ struct Draw_bezier_X_monotone_curve template 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_vector ; - + typedef Simple_cartesian Linear_kernel ; typedef Qt::Converter Converter ; typedef Point_2 Linear_point ; - typedef std::vector Linear_point_vector ; + typedef std::vector Linear_point_vector ; Rat_point_vector lQ ; diff --git a/Boolean_set_operations_2/demo/Boolean_set_operations_2_GraphicsView/include/CGAL/Qt/GpsCircleSegmentGraphicsItem.h b/Boolean_set_operations_2/demo/Boolean_set_operations_2_GraphicsView/include/CGAL/Qt/GpsCircleSegmentGraphicsItem.h index bfe9fa6ff7a..ebc47ff6175 100644 --- a/Boolean_set_operations_2/demo/Boolean_set_operations_2_GraphicsView/include/CGAL/Qt/GpsCircleSegmentGraphicsItem.h +++ b/Boolean_set_operations_2/demo/Boolean_set_operations_2_GraphicsView/include/CGAL/Qt/GpsCircleSegmentGraphicsItem.h @@ -39,7 +39,7 @@ class GpsCircleSegmentGraphicsItem : public GraphicsItem { typedef CS Circle_segment_2 ; - typedef Qt::Converter< Simple_cartesian > Converter ; + typedef Qt::Converter< Simple_cartesian > Converter ; public: @@ -121,7 +121,7 @@ GpsCircleSegmentGraphicsItem::paint(QPainter *painter, QWidget * widget) { painter->setPen(edgesPen()); - + if ( !cs_.is_full() ) { double sx = to_double(cs_.source().x()); @@ -135,7 +135,7 @@ GpsCircleSegmentGraphicsItem::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::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::updateBoundingBox() prepareGeometryChange(); if(cs_.is_circular()) - { + { bounding_rect = convert(cs_.supporting_circle().bbox()); } else @@ -202,15 +202,15 @@ GpsCircleSegmentGraphicsItem::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) ; } } diff --git a/Boolean_set_operations_2/demo/Boolean_set_operations_2_GraphicsView/typedefs.h b/Boolean_set_operations_2/demo/Boolean_set_operations_2_GraphicsView/typedefs.h index 8bbbf42497a..20e5be30299 100644 --- a/Boolean_set_operations_2/demo/Boolean_set_operations_2_GraphicsView/typedefs.h +++ b/Boolean_set_operations_2/demo/Boolean_set_operations_2_GraphicsView/typedefs.h @@ -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. diff --git a/CGALimageIO/src/CGALImageIO/CMakeLists.txt b/CGALimageIO/src/CGALImageIO/CMakeLists.txt index c5aa26e526b..48c8e5a7bee 100644 --- a/CGALimageIO/src/CGALImageIO/CMakeLists.txt +++ b/CGALimageIO/src/CGALImageIO/CMakeLists.txt @@ -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} ) diff --git a/Circular_kernel_2/include/CGAL/Circular_arc_point_2.h b/Circular_kernel_2/include/CGAL/Circular_arc_point_2.h index 356198f1aa9..d1274215545 100644 --- a/Circular_kernel_2/include/CGAL/Circular_arc_point_2.h +++ b/Circular_kernel_2/include/CGAL/Circular_arc_point_2.h @@ -154,7 +154,6 @@ public: std::istream & operator>>(std::istream & is, Circular_arc_point_2 &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; diff --git a/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_circle_2.h b/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_circle_2.h index e93b235e7bc..02cf20ebbdb 100644 --- a/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_circle_2.h +++ b/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_circle_2.h @@ -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() diff --git a/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_circular_arc_2.h b/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_circular_arc_2.h index 0ee5812446d..95ab4825265 100644 --- a/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_circular_arc_2.h +++ b/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_circular_arc_2.h @@ -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 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 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::Protector IntervalProtector; typedef CGAL::Interval_nt Interval; diff --git a/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_line_2.h b/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_line_2.h index 210873eba97..bde982fc978 100644 --- a/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_line_2.h +++ b/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_line_2.h @@ -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()); } diff --git a/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_line_arc_2.h b/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_line_arc_2.h index 42e887510c3..43c069ea93d 100644 --- a/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_line_arc_2.h +++ b/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_line_arc_2.h @@ -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(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 solutions_container; solutions_container solutions; diff --git a/Circular_kernel_3/include/CGAL/Circle_type.h b/Circular_kernel_3/include/CGAL/Circle_type.h index ca8e755e4e5..483680fa216 100644 --- a/Circular_kernel_3/include/CGAL/Circle_type.h +++ b/Circular_kernel_3/include/CGAL/Circle_type.h @@ -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. diff --git a/Conic_2/include/CGAL/ConicHPA2.h b/Conic_2/include/CGAL/ConicHPA2.h index 53245365700..ae340f70c13 100644 --- a/Conic_2/include/CGAL/ConicHPA2.h +++ b/Conic_2/include/CGAL/ConicHPA2.h @@ -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; diff --git a/Convex_decomposition_3/include/CGAL/convex_decomposition_3.h b/Convex_decomposition_3/include/CGAL/convex_decomposition_3.h index 8512557c688..9f841b55e67 100644 --- a/Convex_decomposition_3/include/CGAL/convex_decomposition_3.h +++ b/Convex_decomposition_3/include/CGAL/convex_decomposition_3.h @@ -37,17 +37,13 @@ template 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 Single_wall; - typedef typename CGAL::Single_wall_creator2 Single_wall2; typedef typename CGAL::YVertical_wall_builder YVertical_wall_builder; typedef typename CGAL::Reflex_vertex_searcher Reflex_vertex_searcher; typedef typename CGAL::Ray_hit_generator2 Ray_hit2; diff --git a/Convex_hull_2/include/CGAL/Convex_hull_2/ch_graham_andrew_impl.h b/Convex_hull_2/include/CGAL/Convex_hull_2/ch_graham_andrew_impl.h index f2b2e09dc41..4da70f0c8e2 100644 --- a/Convex_hull_2/include/CGAL/Convex_hull_2/ch_graham_andrew_impl.h +++ b/Convex_hull_2/include/CGAL/Convex_hull_2/ch_graham_andrew_impl.h @@ -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(); diff --git a/Convex_hull_2/include/CGAL/Convex_hull_2/convexity_check_2_impl.h b/Convex_hull_2/include/CGAL/Convex_hull_2/convexity_check_2_impl.h index 7c123df8b97..e4a51132256 100644 --- a/Convex_hull_2/include/CGAL/Convex_hull_2/convexity_check_2_impl.h +++ b/Convex_hull_2/include/CGAL/Convex_hull_2/convexity_check_2_impl.h @@ -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(); diff --git a/Convex_hull_3/include/CGAL/convex_hull_3.h b/Convex_hull_3/include/CGAL/convex_hull_3.h index 0ce40842ea7..cb3ec6312b3 100644 --- a/Convex_hull_3/include/CGAL/convex_hull_3.h +++ b/Convex_hull_3/include/CGAL/convex_hull_3.h @@ -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& 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::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 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_list; typedef typename Point_3_list::iterator P3_iterator; typedef std::pair P3_iterator_pair; @@ -868,7 +862,6 @@ void convex_hull_3(InputIterator first, InputIterator beyond, Object& ch_object) { typedef typename std::iterator_traits::value_type Point_3; - typedef typename Kernel_traits::Kernel K; typedef typename internal::Convex_hull_3::Default_traits_for_Chull_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_list; typedef typename Point_3_list::iterator P3_iterator; diff --git a/Core/src/CGALCore/CMakeLists.txt b/Core/src/CGALCore/CMakeLists.txt index 1494ae5b374..8e5e50f8553 100644 --- a/Core/src/CGALCore/CMakeLists.txt +++ b/Core/src/CGALCore/CMakeLists.txt @@ -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}) diff --git a/Envelope_3/include/CGAL/Envelope_3/Env_plane_traits_3_functions.h b/Envelope_3/include/CGAL/Envelope_3/Env_plane_traits_3_functions.h index 616c3823007..af4bbce85d0 100644 --- a/Envelope_3/include/CGAL/Envelope_3/Env_plane_traits_3_functions.h +++ b/Envelope_3/include/CGAL/Envelope_3/Env_plane_traits_3_functions.h @@ -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); diff --git a/Generator/include/CGAL/random_polygon_2.h b/Generator/include/CGAL/random_polygon_2.h index 248bb30249d..6268d710e64 100644 --- a/Generator/include/CGAL/random_polygon_2.h +++ b/Generator/include/CGAL/random_polygon_2.h @@ -47,7 +47,6 @@ OutputIterator random_polygon_2(std::size_t n, OutputIterator result, { typedef typename Traits::Point_2 Point_2; typedef std::vector Vertex_list; - typedef typename Vertex_list::iterator Iterator; Vertex_list vertices; diff --git a/GraphicsView/demo/Polygon/CMakeLists.txt b/GraphicsView/demo/Polygon/CMakeLists.txt index cdec3735b98..fe5c4066de3 100644 --- a/GraphicsView/demo/Polygon/CMakeLists.txt +++ b/GraphicsView/demo/Polygon/CMakeLists.txt @@ -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.") diff --git a/GraphicsView/src/CGALQt4/CMakeLists.txt b/GraphicsView/src/CGALQt4/CMakeLists.txt index eb26cc59492..d956c43d59b 100644 --- a/GraphicsView/src/CGALQt4/CMakeLists.txt +++ b/GraphicsView/src/CGALQt4/CMakeLists.txt @@ -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} ) diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/function_objects.h b/Homogeneous_kernel/include/CGAL/Homogeneous/function_objects.h index 70a180afd92..b9dc6e940ed 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/function_objects.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/function_objects.h @@ -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 ) diff --git a/Installation/CHANGES b/Installation/CHANGES index c9b69f9350e..04d8d22c79a 100644 --- a/Installation/CHANGES +++ b/Installation/CHANGES @@ -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 diff --git a/Installation/changes.html b/Installation/changes.html index a92e174b2e2..e2cfa16179f 100644 --- a/Installation/changes.html +++ b/Installation/changes.html @@ -110,12 +110,22 @@ David A. Wheeler's 'SLOCCount', restricted to the include/CGAL/

Installation

  • CGAL-4.1 no longer supports the Intel Compiler version 11.0. The Intel - Compiler version 12.0 is supported instead.
    • + Compiler version 12.1 is supported instead.
  • Improved configuration for essential and optional external third party software
  • Added more general script to create CMakeLists.txt files: cgal_create_CMakeLists
  • Availability tests for C++11 features are now performed with the help of Boost.Config. A Boost version of 1.40.0 or higher is needed to use C++11 features.
+

2D Arrangement

+
    +
  • 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. +
    • +
+

2D Convex Hulls and Extreme Points

  • Speed up the preprocessing stage of the Akl-Toussaint implementation (used by the free function convex_hull_2 when forward iterators are provided as input).
    • diff --git a/Installation/cmake/modules/CGAL_CreateSingleSourceCGALProgram.cmake b/Installation/cmake/modules/CGAL_CreateSingleSourceCGALProgram.cmake index ababb2cea1f..98ddbf5b672 100644 --- a/Installation/cmake/modules/CGAL_CreateSingleSourceCGALProgram.cmake +++ b/Installation/cmake/modules/CGAL_CreateSingleSourceCGALProgram.cmake @@ -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} ) diff --git a/Installation/cmake/modules/CGAL_CreateSingleSourceCGALProgramQt4.cmake b/Installation/cmake/modules/CGAL_CreateSingleSourceCGALProgramQt4.cmake index d78946ffb1b..2c3cbd0a614 100644 --- a/Installation/cmake/modules/CGAL_CreateSingleSourceCGALProgramQt4.cmake +++ b/Installation/cmake/modules/CGAL_CreateSingleSourceCGALProgramQt4.cmake @@ -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 ) diff --git a/Installation/cmake/modules/CGAL_Macros.cmake b/Installation/cmake/modules/CGAL_Macros.cmake index 340ea3abcea..781743f15be 100644 --- a/Installation/cmake/modules/CGAL_Macros.cmake +++ b/Installation/cmake/modules/CGAL_Macros.cmake @@ -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() diff --git a/Installation/cmake/modules/CGAL_UseBLAS.cmake b/Installation/cmake/modules/CGAL_UseBLAS.cmake index 37de5468bc5..941b795ba78 100644 --- a/Installation/cmake/modules/CGAL_UseBLAS.cmake +++ b/Installation/cmake/modules/CGAL_UseBLAS.cmake @@ -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} ) diff --git a/Installation/cmake/modules/CGAL_UseLAPACK.cmake b/Installation/cmake/modules/CGAL_UseLAPACK.cmake index b88f53e151f..89790863a72 100644 --- a/Installation/cmake/modules/CGAL_UseLAPACK.cmake +++ b/Installation/cmake/modules/CGAL_UseLAPACK.cmake @@ -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} ) diff --git a/Installation/cmake/modules/CGAL_UseLEDA.cmake b/Installation/cmake/modules/CGAL_UseLEDA.cmake index d16bfb12565..a66a58badca 100644 --- a/Installation/cmake/modules/CGAL_UseLEDA.cmake +++ b/Installation/cmake/modules/CGAL_UseLEDA.cmake @@ -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} ) diff --git a/Installation/cmake/modules/CGAL_UseMKL.cmake b/Installation/cmake/modules/CGAL_UseMKL.cmake index 9ae7f2e6207..50fd0328adf 100644 --- a/Installation/cmake/modules/CGAL_UseMKL.cmake +++ b/Installation/cmake/modules/CGAL_UseMKL.cmake @@ -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} ) diff --git a/Installation/cmake/modules/CGAL_UseMPFI.cmake b/Installation/cmake/modules/CGAL_UseMPFI.cmake index 17692545ea5..7c98037cf31 100644 --- a/Installation/cmake/modules/CGAL_UseMPFI.cmake +++ b/Installation/cmake/modules/CGAL_UseMPFI.cmake @@ -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} ) diff --git a/Installation/cmake/modules/CGAL_UseRS.cmake b/Installation/cmake/modules/CGAL_UseRS.cmake index 80b92790093..a3e4dcc205c 100644 --- a/Installation/cmake/modules/CGAL_UseRS.cmake +++ b/Installation/cmake/modules/CGAL_UseRS.cmake @@ -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} ) diff --git a/Installation/cmake/modules/CGAL_UseRS3.cmake b/Installation/cmake/modules/CGAL_UseRS3.cmake index 27cd09c1267..350ad2adb37 100644 --- a/Installation/cmake/modules/CGAL_UseRS3.cmake +++ b/Installation/cmake/modules/CGAL_UseRS3.cmake @@ -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 ) diff --git a/Installation/cmake/modules/CGAL_UseTAUCS.cmake b/Installation/cmake/modules/CGAL_UseTAUCS.cmake index 3a3035ca411..b980dee1d31 100644 --- a/Installation/cmake/modules/CGAL_UseTAUCS.cmake +++ b/Installation/cmake/modules/CGAL_UseTAUCS.cmake @@ -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" ) diff --git a/Installation/cmake/modules/CGAL_VersionUtils.cmake b/Installation/cmake/modules/CGAL_VersionUtils.cmake index 37627dd169a..11a88cbb428 100644 --- a/Installation/cmake/modules/CGAL_VersionUtils.cmake +++ b/Installation/cmake/modules/CGAL_VersionUtils.cmake @@ -227,4 +227,4 @@ if ( UNIT_TEST_VERSION_UTILS ) endif() -endif() \ No newline at end of file +endif() diff --git a/Installation/cmake/modules/FindCGAL.cmake b/Installation/cmake/modules/FindCGAL.cmake index 75be66de3dc..b7cfa5bc170 100644 --- a/Installation/cmake/modules/FindCGAL.cmake +++ b/Installation/cmake/modules/FindCGAL.cmake @@ -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) diff --git a/Installation/cmake/modules/FindGMP.cmake b/Installation/cmake/modules/FindGMP.cmake index 797099912ef..f54aa604266 100644 --- a/Installation/cmake/modules/FindGMP.cmake +++ b/Installation/cmake/modules/FindGMP.cmake @@ -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 diff --git a/Installation/cmake/modules/FindGMPXX.cmake b/Installation/cmake/modules/FindGMPXX.cmake index babde0630ce..9c049f72cf6 100644 --- a/Installation/cmake/modules/FindGMPXX.cmake +++ b/Installation/cmake/modules/FindGMPXX.cmake @@ -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 diff --git a/Installation/cmake/modules/FindRS.cmake b/Installation/cmake/modules/FindRS.cmake index a44d333cb41..ab39259e8ef 100644 --- a/Installation/cmake/modules/FindRS.cmake +++ b/Installation/cmake/modules/FindRS.cmake @@ -12,7 +12,6 @@ endif() if( MPFI_FOUND ) include( CGAL_VersionUtils ) - include( ${MPFI_USE_FILE} ) find_path(RS_INCLUDE_DIR NAMES rs_exports.h diff --git a/Installation/cmake/modules/FindRS3.cmake b/Installation/cmake/modules/FindRS3.cmake index 802cdc0c8f4..e592d0bf8ce 100644 --- a/Installation/cmake/modules/FindRS3.cmake +++ b/Installation/cmake/modules/FindRS3.cmake @@ -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 ) diff --git a/Installation/cmake/modules/UseCGAL.cmake b/Installation/cmake/modules/UseCGAL.cmake index 1a18a69bf33..00b2de8710a 100644 --- a/Installation/cmake/modules/UseCGAL.cmake +++ b/Installation/cmake/modules/UseCGAL.cmake @@ -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} ) diff --git a/Installation/cmake/modules/UseESBTL.cmake b/Installation/cmake/modules/UseESBTL.cmake index d72567a5da9..5c820753402 100644 --- a/Installation/cmake/modules/UseESBTL.cmake +++ b/Installation/cmake/modules/UseESBTL.cmake @@ -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} ) diff --git a/Installation/cmake/modules/UseEigen3.cmake b/Installation/cmake/modules/UseEigen3.cmake index 88892219b3d..e3ed18be243 100644 --- a/Installation/cmake/modules/UseEigen3.cmake +++ b/Installation/cmake/modules/UseEigen3.cmake @@ -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) diff --git a/Installation/src/CGAL/CMakeLists.txt b/Installation/src/CGAL/CMakeLists.txt index 8bef65a6f11..fc153457c3c 100644 --- a/Installation/src/CGAL/CMakeLists.txt +++ b/Installation/src/CGAL/CMakeLists.txt @@ -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}) diff --git a/Kinetic_data_structures/demo/Kinetic_data_structures/include/Qt_Delaunay_stable_subset_2.h b/Kinetic_data_structures/demo/Kinetic_data_structures/include/Qt_Delaunay_stable_subset_2.h index 38da5a62aef..61943524861 100644 --- a/Kinetic_data_structures/demo/Kinetic_data_structures/include/Qt_Delaunay_stable_subset_2.h +++ b/Kinetic_data_structures/demo/Kinetic_data_structures/include/Qt_Delaunay_stable_subset_2.h @@ -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); diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/IO/Qt_moving_points_2.h b/Kinetic_data_structures/include/CGAL/Kinetic/IO/Qt_moving_points_2.h index c21dea456ba..c7946ffb395 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/IO/Qt_moving_points_2.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/IO/Qt_moving_points_2.h @@ -170,7 +170,6 @@ template void Qt_moving_points_2::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::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)); diff --git a/Maintenance/infrastructure/cgal.geometryfactory.com/crontab b/Maintenance/infrastructure/cgal.geometryfactory.com/crontab index 05d89edf5ab..157299aa2a3 100644 --- a/Maintenance/infrastructure/cgal.geometryfactory.com/crontab +++ b/Maintenance/infrastructure/cgal.geometryfactory.com/crontab @@ -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 diff --git a/Maintenance/infrastructure/renoir.geometryfactory.com/.autocgalrc b/Maintenance/infrastructure/renoir.geometryfactory.com/.autocgalrc index 9136247990c..cde2451f5d8 100644 --- a/Maintenance/infrastructure/renoir.geometryfactory.com/.autocgalrc +++ b/Maintenance/infrastructure/renoir.geometryfactory.com/.autocgalrc @@ -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 diff --git a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/CMakeCache.txt b/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 similarity index 87% rename from Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/CMakeCache.txt rename to 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 index beb8c651235..c437fca0dca 100644 --- a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/CMakeCache.txt +++ b/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 @@ -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 diff --git a/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 b/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 new file mode 100644 index 00000000000..663302d4881 --- /dev/null +++ b/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 @@ -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 diff --git a/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 b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16/CMakeCache.txt similarity index 85% rename from 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 rename to Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16/CMakeCache.txt index 5fd5eab8fcb..a3471c6d126 100644 --- a/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 +++ b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16/CMakeCache.txt @@ -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 diff --git a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/setup b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16/setup similarity index 62% rename from Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/setup rename to Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16/setup index 360b0f4a959..52c93877eb7 100644 --- a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/setup +++ b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16/setup @@ -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 diff --git a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-13.0beta-with-g++-4.6.3-STL_F16/CMakeCache.txt b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-13.0beta-with-g++-4.6.3-STL_F16/CMakeCache.txt new file mode 100644 index 00000000000..613ee3df8d9 --- /dev/null +++ b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-13.0beta-with-g++-4.6.3-STL_F16/CMakeCache.txt @@ -0,0 +1,2114 @@ +# This is the CMakeCache file. +# For build in directory: /home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-13.0beta-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. +# If you do want to change a value, simply edit, save, and exit the editor. +# The syntax for the file is as follows: +# KEY:TYPE=VALUE +# KEY is the name of a variable in the cache. +# TYPE is a hint to GUI's for the type of VALUE, DO NOT EDIT TYPE!. +# VALUE is the current value for the KEY. + +######################## +# EXTERNAL cache entries +######################## + +//Build shared libraries +BUILD_SHARED_LIBS:BOOL=ON + +//The directory containing a CMake configuration file for Boost. +Boost_DIR:PATH=Boost_DIR-NOTFOUND + +//Path to a file. +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 + +//Boost thread library (debug) +Boost_THREAD_LIBRARY_DEBUG:FILEPATH=/home/lrineau/CGAL/boost/boost-release-branch/stage-intel/lib/libboost_thread-mt.so + +//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-13.0beta-with-g++-4.6.3-STL_F16 + +//Link with static Boost libraries +CGAL_Boost_USE_STATIC_LIBS:BOOL=OFF + +//Directory containing the Core package +CGAL_CORE_PACKAGE_DIR:PATH=/home/lrineau/CGAL/CGAL-I + +//User-defined flags +CGAL_CXX_FLAGS:STRING= -fp-model strict + +//The CGAL_Core library +CGAL_Core_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-13.0beta-with-g++-4.6.3-STL_F16/lib/libCGAL_Core.so + +//Dependencies for the target +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-13.0beta-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 +// with the values used when building the CGAL libs. For CGAL_*_flags +// (used for ADDITIONAL flags) , there is no need to set this to +// 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 + +//The folder where CGAL user-side scripts will be installed, relative +// to CMAKE_INSTALL_PREFIX +CGAL_INSTALL_BIN_DIR:STRING=bin + +//The folder where CGAL CMake modules will be installed, relative +// to CMAKE_INSTALL_PREFIX +CGAL_INSTALL_CMAKE_DIR:STRING=lib/CGAL + +//The folder where CGAL documentation and license files will be +// installed, relative to CMAKE_INSTALL_PREFIX +CGAL_INSTALL_DOC_DIR:STRING=share/doc/CGAL-4.1-I-118 + +//The folder where CGAL header files will be installed, relative +// to CMAKE_INSTALL_PREFIX +CGAL_INSTALL_INC_DIR:STRING=include + +//The folder where CGAL libraries will be installed, relative to +// CMAKE_INSTALL_PREFIX +CGAL_INSTALL_LIB_DIR:STRING=lib + +//The folder where manual pages for CGAL scripts will be installed, +// relative to CMAKE_INSTALL_PREFIX +CGAL_INSTALL_MAN_DIR:STRING=share/man/man1 + +//The CGAL_ImageIO library +CGAL_ImageIO_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-13.0beta-with-g++-4.6.3-STL_F16/lib/libCGAL_ImageIO.so + +//Dependencies for the target +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-13.0beta-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-13.0beta-with-g++-4.6.3-STL_F16/lib/libCGAL.so + +//Dependencies for the target +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 + +//The CGAL_Qt3 library +CGAL_Qt3_LIBRARY:STRING=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-13.0beta-with-g++-4.6.3-STL_F16/lib/libCGAL_Qt3.so + +//Dependencies for the target +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-13.0beta-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-13.0beta-with-g++-4.6.3-STL_F16/lib/libCGAL_Qt4.so + +//Dependencies for the target +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-13.0beta-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 + +//Path to a program. +CMAKE_AR:FILEPATH=/usr/bin/ar + +//Build type: Release or Debug +CMAKE_BUILD_TYPE:STRING=Release + +//Enable/Disable color output during build. +CMAKE_COLOR_MAKEFILE:BOOL=ON + +//CXX compiler. +CMAKE_CXX_COMPILER:FILEPATH=/opt/intel/composer_xe_2013.0.030/bin/intel64/icpc + +//User-defined flags +CMAKE_CXX_FLAGS:STRING= -fp-model strict + +//Flags used by the compiler during debug builds. +CMAKE_CXX_FLAGS_DEBUG:STRING=-g + +//Flags used by the compiler during release minsize builds. +CMAKE_CXX_FLAGS_MINSIZEREL:STRING=-Os -DNDEBUG + +//Flags used by the compiler during release builds (/MD /Ob1 /Oi +// /Ot /Oy /Gs will produce slightly less optimized but smaller +// files). +CMAKE_CXX_FLAGS_RELEASE:STRING=-O3 + +//Flags used by the compiler during Release with Debug Info builds. +CMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING=-O2 -g + +//C compiler. +CMAKE_C_COMPILER:FILEPATH=/opt/intel/composer_xe_2013.0.030/bin/intel64/icc + +//Flags used by the compiler during all build types. +CMAKE_C_FLAGS:STRING= + +//Flags used by the compiler during debug builds. +CMAKE_C_FLAGS_DEBUG:STRING=-g + +//Flags used by the compiler during release minsize builds. +CMAKE_C_FLAGS_MINSIZEREL:STRING=-Os -DNDEBUG + +//Flags used by the compiler during release builds (/MD /Ob1 /Oi +// /Ot /Oy /Gs will produce slightly less optimized but smaller +// files). +CMAKE_C_FLAGS_RELEASE:STRING=-O3 -DNDEBUG + +//Flags used by the compiler during Release with Debug Info builds. +CMAKE_C_FLAGS_RELWITHDEBINFO:STRING=-O2 -g + +//Flags used by the linker. +CMAKE_EXE_LINKER_FLAGS:STRING=' ' + +//Flags used by the linker during debug builds. +CMAKE_EXE_LINKER_FLAGS_DEBUG:STRING= + +//Flags used by the linker during release minsize builds. +CMAKE_EXE_LINKER_FLAGS_MINSIZEREL:STRING= + +//Flags used by the linker during release builds. +CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING= + +//Flags used by the linker during Release with Debug Info builds. +CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING= + +//Enable/Disable output of compile commands during generation. +CMAKE_EXPORT_COMPILE_COMMANDS:BOOL=OFF + +//Install path prefix, prepended onto install directories. +CMAKE_INSTALL_PREFIX:PATH=/usr/local + +//Path to a program. +CMAKE_LINKER:FILEPATH=/usr/bin/ld + +//Path to a program. +CMAKE_MAKE_PROGRAM:FILEPATH=/usr/bin/gmake + +//Flags used by the linker during the creation of modules. +CMAKE_MODULE_LINKER_FLAGS:STRING=' ' + +//Flags used by the linker during debug builds. +CMAKE_MODULE_LINKER_FLAGS_DEBUG:STRING= + +//Flags used by the linker during release minsize builds. +CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL:STRING= + +//Flags used by the linker during release builds. +CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING= + +//Flags used by the linker during Release with Debug Info builds. +CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING= + +//Path to a program. +CMAKE_NM:FILEPATH=/usr/bin/nm + +//Path to a program. +CMAKE_OBJCOPY:FILEPATH=/usr/bin/objcopy + +//Path to a program. +CMAKE_OBJDUMP:FILEPATH=/usr/bin/objdump + +//Value Computed by CMake +CMAKE_PROJECT_NAME:STATIC=CGAL + +//Path to a program. +CMAKE_RANLIB:FILEPATH=/usr/bin/ranlib + +//Flags used by the linker during the creation of dll's. +CMAKE_SHARED_LINKER_FLAGS:STRING=' ' + +//Flags used by the linker during debug builds. +CMAKE_SHARED_LINKER_FLAGS_DEBUG:STRING= + +//Flags used by the linker during release minsize builds. +CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL:STRING= + +//Flags used by the linker during release builds. +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=NO + +//Path to a program. +CMAKE_STRIP:FILEPATH=/usr/bin/strip + +//If true, cmake will use relative paths in makefiles and projects. +CMAKE_USE_RELATIVE_PATHS:BOOL=OFF + +//If this value is on, makefiles will be generated without the +// .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=FALSE + +//The directory containing the GMP header files +GMP_INCLUDE_DIR:PATH=/usr/include + +//Path to the GMP library +GMP_LIBRARIES:FILEPATH=/usr/lib64/libgmp.so + +GMP_LIBRARIES_DIR:FILEPATH=/usr/lib64 + +//The directory containing the MPFR header files +MPFR_INCLUDE_DIR:PATH=/usr/include + +//Path to the MPFR library +MPFR_LIBRARIES:FILEPATH=/usr/lib64/libmpfr.so + +MPFR_LIBRARIES_DIR:FILEPATH=/usr/lib64 + +//Path to a file. +OPENGL_INCLUDE_DIR:PATH=/usr/include + +//Path to a library. +OPENGL_gl_LIBRARY:FILEPATH=/usr/lib64/libGL.so + +//Path to a library. +OPENGL_glu_LIBRARY:FILEPATH=/usr/lib64/libGLU.so + +//Path to a file. +OPENGL_xmesa_INCLUDE_DIR:PATH=OPENGL_xmesa_INCLUDE_DIR-NOTFOUND + +//Path to a file. +QT3_INCLUDE_DIR:PATH=/usr/lib64/qt-3.3/include + +//Path to a program. +QT3_MOC_EXECUTABLE:FILEPATH=/usr/lib64/qt-3.3/bin/moc + +//Path to a library. +QT3_QASSISTANTCLIENT_LIBRARY:FILEPATH=/usr/lib64/qt-3.3/lib/libqassistantclient.a + +//Path to a library. +QT3_QT_LIBRARY:FILEPATH=/usr/lib64/qt-3.3/lib/libqt-mt.so + +//Path to a program. +QT3_UIC_EXECUTABLE:FILEPATH=/usr/lib64/qt-3.3/bin/uic + +//Path to a library. +QT_ARTHURPLUGIN_PLUGIN_DEBUG:FILEPATH=QT_ARTHURPLUGIN_PLUGIN_DEBUG-NOTFOUND + +//Path to a library. +QT_ARTHURPLUGIN_PLUGIN_RELEASE:FILEPATH=/usr/lib64/qt4/plugins/designer/libarthurplugin.so + +//Path to a library. +QT_CONTAINEREXTENSION_PLUGIN_DEBUG:FILEPATH=QT_CONTAINEREXTENSION_PLUGIN_DEBUG-NOTFOUND + +//Path to a library. +QT_CONTAINEREXTENSION_PLUGIN_RELEASE:FILEPATH=/usr/lib64/qt4/plugins/designer/libcontainerextension.so + +//Path to a library. +QT_CUSTOMWIDGETPLUGIN_PLUGIN_DEBUG:FILEPATH=QT_CUSTOMWIDGETPLUGIN_PLUGIN_DEBUG-NOTFOUND + +//Path to a library. +QT_CUSTOMWIDGETPLUGIN_PLUGIN_RELEASE:FILEPATH=/usr/lib64/qt4/plugins/designer/libcustomwidgetplugin.so + +//Path to a program. +QT_DBUSCPP2XML_EXECUTABLE:FILEPATH=/usr/lib64/qt4/bin/qdbuscpp2xml + +//Path to a program. +QT_DBUSXML2CPP_EXECUTABLE:FILEPATH=/usr/lib64/qt4/bin/qdbusxml2cpp + +//Path to a program. +QT_DESIGNER_EXECUTABLE:FILEPATH=/usr/lib64/qt4/bin/designer-qt4 + +//The location of the Qt docs +QT_DOC_DIR:PATH=/usr/share/doc/qt4 + +//The location of the Qt imports +QT_IMPORTS_DIR:PATH=/usr/lib64/qt4/imports + +//Path to a program. +QT_LINGUIST_EXECUTABLE:FILEPATH=/usr/lib64/qt4/bin/linguist-qt4 + +//Path to a program. +QT_LRELEASE_EXECUTABLE:FILEPATH=/usr/lib64/qt4/bin/lrelease-qt4 + +//Path to a program. +QT_LUPDATE_EXECUTABLE:FILEPATH=/usr/lib64/qt4/bin/lupdate-qt4 + +//The location of the Qt mkspecs containing qconfig.pri +QT_MKSPECS_DIR:PATH=/usr/lib64/qt4/mkspecs + +//Path to a program. +QT_MOC_EXECUTABLE:FILEPATH=/usr/lib64/qt4/bin/moc-qt4 + +//Path to a library. +QT_PHONONWIDGETS_PLUGIN_DEBUG:FILEPATH=QT_PHONONWIDGETS_PLUGIN_DEBUG-NOTFOUND + +//Path to a library. +QT_PHONONWIDGETS_PLUGIN_RELEASE:FILEPATH=/usr/lib64/qt4/plugins/designer/libphononwidgets.so + +//Path to a file. +QT_PHONON_INCLUDE_DIR:PATH=/usr/include/phonon + +//The Qt PHONON library +QT_PHONON_LIBRARY:STRING=/usr/lib64/libphonon.so + +//Path to a library. +QT_PHONON_LIBRARY_DEBUG:FILEPATH=QT_PHONON_LIBRARY_DEBUG-NOTFOUND + +//Path to a library. +QT_PHONON_LIBRARY_RELEASE:FILEPATH=/usr/lib64/libphonon.so + +//Path to a library. +QT_PHONON_QT7_PLUGIN_DEBUG:FILEPATH=QT_PHONON_QT7_PLUGIN_DEBUG-NOTFOUND + +//Path to a library. +QT_PHONON_QT7_PLUGIN_RELEASE:FILEPATH=QT_PHONON_QT7_PLUGIN_RELEASE-NOTFOUND + +//The location of the Qt plugins +QT_PLUGINS_DIR:PATH=/usr/lib64/qt4/plugins + +//Path to a library. +QT_QCNCODECS_PLUGIN_DEBUG:FILEPATH=QT_QCNCODECS_PLUGIN_DEBUG-NOTFOUND + +//Path to a library. +QT_QCNCODECS_PLUGIN_RELEASE:FILEPATH=/usr/lib64/qt4/plugins/codecs/libqcncodecs.so + +//Path to a program. +QT_QCOLLECTIONGENERATOR_EXECUTABLE:FILEPATH=/usr/lib64/qt4/bin/qcollectiongenerator + +//Path to a library. +QT_QCOREWLANBEARER_PLUGIN_DEBUG:FILEPATH=QT_QCOREWLANBEARER_PLUGIN_DEBUG-NOTFOUND + +//Path to a library. +QT_QCOREWLANBEARER_PLUGIN_RELEASE:FILEPATH=QT_QCOREWLANBEARER_PLUGIN_RELEASE-NOTFOUND + +//Path to a library. +QT_QDECLARATIVEVIEW_PLUGIN_DEBUG:FILEPATH=QT_QDECLARATIVEVIEW_PLUGIN_DEBUG-NOTFOUND + +//Path to a library. +QT_QDECLARATIVEVIEW_PLUGIN_RELEASE:FILEPATH=/usr/lib64/qt4/plugins/designer/libqdeclarativeview.so + +//Path to a library. +QT_QDECORATIONDEFAULT_PLUGIN_DEBUG:FILEPATH=QT_QDECORATIONDEFAULT_PLUGIN_DEBUG-NOTFOUND + +//Path to a library. +QT_QDECORATIONDEFAULT_PLUGIN_RELEASE:FILEPATH=QT_QDECORATIONDEFAULT_PLUGIN_RELEASE-NOTFOUND + +//Path to a library. +QT_QDECORATIONWINDOWS_PLUGIN_DEBUG:FILEPATH=QT_QDECORATIONWINDOWS_PLUGIN_DEBUG-NOTFOUND + +//Path to a library. +QT_QDECORATIONWINDOWS_PLUGIN_RELEASE:FILEPATH=QT_QDECORATIONWINDOWS_PLUGIN_RELEASE-NOTFOUND + +//Path to a library. +QT_QGENERICBEARER_PLUGIN_DEBUG:FILEPATH=QT_QGENERICBEARER_PLUGIN_DEBUG-NOTFOUND + +//Path to a library. +QT_QGENERICBEARER_PLUGIN_RELEASE:FILEPATH=/usr/lib64/qt4/plugins/bearer/libqgenericbearer.so + +//Path to a library. +QT_QGIF_PLUGIN_DEBUG:FILEPATH=QT_QGIF_PLUGIN_DEBUG-NOTFOUND + +//Path to a library. +QT_QGIF_PLUGIN_RELEASE:FILEPATH=/usr/lib64/qt4/plugins/imageformats/libqgif.so + +//Path to a library. +QT_QGLGRAPHICSSYSTEM_PLUGIN_DEBUG:FILEPATH=QT_QGLGRAPHICSSYSTEM_PLUGIN_DEBUG-NOTFOUND + +//Path to a library. +QT_QGLGRAPHICSSYSTEM_PLUGIN_RELEASE:FILEPATH=/usr/lib64/qt4/plugins/graphicssystems/libqglgraphicssystem.so + +//Path to a library. +QT_QICO_PLUGIN_DEBUG:FILEPATH=QT_QICO_PLUGIN_DEBUG-NOTFOUND + +//Path to a library. +QT_QICO_PLUGIN_RELEASE:FILEPATH=/usr/lib64/qt4/plugins/imageformats/libqico.so + +//Path to a library. +QT_QIMSW_MULTI_PLUGIN_DEBUG:FILEPATH=QT_QIMSW_MULTI_PLUGIN_DEBUG-NOTFOUND + +//Path to a library. +QT_QIMSW_MULTI_PLUGIN_RELEASE:FILEPATH=QT_QIMSW_MULTI_PLUGIN_RELEASE-NOTFOUND + +//Path to a library. +QT_QJPCODECS_PLUGIN_DEBUG:FILEPATH=QT_QJPCODECS_PLUGIN_DEBUG-NOTFOUND + +//Path to a library. +QT_QJPCODECS_PLUGIN_RELEASE:FILEPATH=/usr/lib64/qt4/plugins/codecs/libqjpcodecs.so + +//Path to a library. +QT_QJPEG_PLUGIN_DEBUG:FILEPATH=QT_QJPEG_PLUGIN_DEBUG-NOTFOUND + +//Path to a library. +QT_QJPEG_PLUGIN_RELEASE:FILEPATH=/usr/lib64/qt4/plugins/imageformats/libqjpeg.so + +//Path to a library. +QT_QKRCODECS_PLUGIN_DEBUG:FILEPATH=QT_QKRCODECS_PLUGIN_DEBUG-NOTFOUND + +//Path to a library. +QT_QKRCODECS_PLUGIN_RELEASE:FILEPATH=/usr/lib64/qt4/plugins/codecs/libqkrcodecs.so + +//Where can one of the qmake4 or qmake-qt4 libraries be found +QT_QMAKE_EXECUTABLE:FILEPATH=/usr/bin/qmake-qt4 + +//Path to a library. +QT_QMNG_PLUGIN_DEBUG:FILEPATH=QT_QMNG_PLUGIN_DEBUG-NOTFOUND + +//Path to a library. +QT_QMNG_PLUGIN_RELEASE:FILEPATH=/usr/lib64/qt4/plugins/imageformats/libqmng.so + +//Path to a library. +QT_QSQLDB2_PLUGIN_DEBUG:FILEPATH=QT_QSQLDB2_PLUGIN_DEBUG-NOTFOUND + +//Path to a library. +QT_QSQLDB2_PLUGIN_RELEASE:FILEPATH=QT_QSQLDB2_PLUGIN_RELEASE-NOTFOUND + +//Path to a library. +QT_QSQLIBASE_PLUGIN_DEBUG:FILEPATH=QT_QSQLIBASE_PLUGIN_DEBUG-NOTFOUND + +//Path to a library. +QT_QSQLIBASE_PLUGIN_RELEASE:FILEPATH=QT_QSQLIBASE_PLUGIN_RELEASE-NOTFOUND + +//Path to a library. +QT_QSQLITE2_PLUGIN_DEBUG:FILEPATH=QT_QSQLITE2_PLUGIN_DEBUG-NOTFOUND + +//Path to a library. +QT_QSQLITE2_PLUGIN_RELEASE:FILEPATH=QT_QSQLITE2_PLUGIN_RELEASE-NOTFOUND + +//Path to a library. +QT_QSQLITE_PLUGIN_DEBUG:FILEPATH=QT_QSQLITE_PLUGIN_DEBUG-NOTFOUND + +//Path to a library. +QT_QSQLITE_PLUGIN_RELEASE:FILEPATH=/usr/lib64/qt4/plugins/sqldrivers/libqsqlite.so + +//Path to a library. +QT_QSQLMYSQL_PLUGIN_DEBUG:FILEPATH=QT_QSQLMYSQL_PLUGIN_DEBUG-NOTFOUND + +//Path to a library. +QT_QSQLMYSQL_PLUGIN_RELEASE:FILEPATH=/usr/lib64/qt4/plugins/sqldrivers/libqsqlmysql.so + +//Path to a library. +QT_QSQLOCI_PLUGIN_DEBUG:FILEPATH=QT_QSQLOCI_PLUGIN_DEBUG-NOTFOUND + +//Path to a library. +QT_QSQLOCI_PLUGIN_RELEASE:FILEPATH=QT_QSQLOCI_PLUGIN_RELEASE-NOTFOUND + +//Path to a library. +QT_QSQLODBC_PLUGIN_DEBUG:FILEPATH=QT_QSQLODBC_PLUGIN_DEBUG-NOTFOUND + +//Path to a library. +QT_QSQLODBC_PLUGIN_RELEASE:FILEPATH=QT_QSQLODBC_PLUGIN_RELEASE-NOTFOUND + +//Path to a library. +QT_QSQLPSQL_PLUGIN_DEBUG:FILEPATH=QT_QSQLPSQL_PLUGIN_DEBUG-NOTFOUND + +//Path to a library. +QT_QSQLPSQL_PLUGIN_RELEASE:FILEPATH=QT_QSQLPSQL_PLUGIN_RELEASE-NOTFOUND + +//Path to a library. +QT_QSQLTDS_PLUGIN_DEBUG:FILEPATH=QT_QSQLTDS_PLUGIN_DEBUG-NOTFOUND + +//Path to a library. +QT_QSQLTDS_PLUGIN_RELEASE:FILEPATH=QT_QSQLTDS_PLUGIN_RELEASE-NOTFOUND + +//Path to a library. +QT_QSVGICON_PLUGIN_DEBUG:FILEPATH=QT_QSVGICON_PLUGIN_DEBUG-NOTFOUND + +//Path to a library. +QT_QSVGICON_PLUGIN_RELEASE:FILEPATH=/usr/lib64/qt4/plugins/iconengines/libqsvgicon.so + +//Path to a library. +QT_QSVG_PLUGIN_DEBUG:FILEPATH=QT_QSVG_PLUGIN_DEBUG-NOTFOUND + +//Path to a library. +QT_QSVG_PLUGIN_RELEASE:FILEPATH=/usr/lib64/qt4/plugins/imageformats/libqsvg.so + +//Path to a library. +QT_QT3SUPPORTWIDGETS_PLUGIN_DEBUG:FILEPATH=QT_QT3SUPPORTWIDGETS_PLUGIN_DEBUG-NOTFOUND + +//Path to a library. +QT_QT3SUPPORTWIDGETS_PLUGIN_RELEASE:FILEPATH=/usr/lib64/qt4/plugins/designer/libqt3supportwidgets.so + +//Path to a file. +QT_QT3SUPPORT_INCLUDE_DIR:PATH=/usr/include/Qt3Support + +//The Qt QT3SUPPORT library +QT_QT3SUPPORT_LIBRARY:STRING=optimized;/usr/lib64/libQt3Support.so;debug;/usr/lib64/libQt3Support_debug.so + +//Path to a library. +QT_QT3SUPPORT_LIBRARY_DEBUG:FILEPATH=/usr/lib64/libQt3Support_debug.so + +//Path to a library. +QT_QT3SUPPORT_LIBRARY_RELEASE:FILEPATH=/usr/lib64/libQt3Support.so + +//Path to a library. +QT_QTACCESSIBLECOMPATWIDGETS_PLUGIN_DEBUG:FILEPATH=QT_QTACCESSIBLECOMPATWIDGETS_PLUGIN_DEBUG-NOTFOUND + +//Path to a library. +QT_QTACCESSIBLECOMPATWIDGETS_PLUGIN_RELEASE:FILEPATH=/usr/lib64/qt4/plugins/accessible/libqtaccessiblecompatwidgets.so + +//Path to a library. +QT_QTACCESSIBLEWIDGETS_PLUGIN_DEBUG:FILEPATH=QT_QTACCESSIBLEWIDGETS_PLUGIN_DEBUG-NOTFOUND + +//Path to a library. +QT_QTACCESSIBLEWIDGETS_PLUGIN_RELEASE:FILEPATH=/usr/lib64/qt4/plugins/accessible/libqtaccessiblewidgets.so + +//Path to a file. +QT_QTASSISTANTCLIENT_INCLUDE_DIR:PATH=/usr/include/QtAssistant + +//The Qt QTASSISTANTCLIENT library +QT_QTASSISTANTCLIENT_LIBRARY:STRING=optimized;/usr/lib64/libQtAssistantClient.so;debug;/usr/lib64/libQtAssistantClient_debug.so + +//Path to a library. +QT_QTASSISTANTCLIENT_LIBRARY_DEBUG:FILEPATH=/usr/lib64/libQtAssistantClient_debug.so + +//Path to a library. +QT_QTASSISTANTCLIENT_LIBRARY_RELEASE:FILEPATH=/usr/lib64/libQtAssistantClient.so + +//Path to a file. +QT_QTASSISTANT_INCLUDE_DIR:PATH=/usr/include/QtAssistant + +//The Qt QTASSISTANT library +QT_QTASSISTANT_LIBRARY:STRING=optimized;/usr/lib64/libQtAssistantClient.so;debug;/usr/lib64/libQtAssistantClient_debug.so + +//Path to a library. +QT_QTASSISTANT_LIBRARY_DEBUG:FILEPATH=/usr/lib64/libQtAssistantClient_debug.so + +//Path to a library. +QT_QTASSISTANT_LIBRARY_RELEASE:FILEPATH=/usr/lib64/libQtAssistantClient.so + +//The Qt QTCLUCENE library +QT_QTCLUCENE_LIBRARY:STRING=optimized;/usr/lib64/libQtCLucene.so;debug;/usr/lib64/libQtCLucene_debug.so + +//Path to a library. +QT_QTCLUCENE_LIBRARY_DEBUG:FILEPATH=/usr/lib64/libQtCLucene_debug.so + +//Path to a library. +QT_QTCLUCENE_LIBRARY_RELEASE:FILEPATH=/usr/lib64/libQtCLucene.so + +//Path to a file. +QT_QTCORE_INCLUDE_DIR:PATH=/usr/include/QtCore + +//The Qt QTCORE library +QT_QTCORE_LIBRARY:STRING=optimized;/usr/lib64/libQtCore.so;debug;/usr/lib64/libQtCore_debug.so + +//Path to a library. +QT_QTCORE_LIBRARY_DEBUG:FILEPATH=/usr/lib64/libQtCore_debug.so + +//Path to a library. +QT_QTCORE_LIBRARY_RELEASE:FILEPATH=/usr/lib64/libQtCore.so + +//Path to a file. +QT_QTDBUS_INCLUDE_DIR:PATH=/usr/include/QtDBus + +//The Qt QTDBUS library +QT_QTDBUS_LIBRARY:STRING=optimized;/usr/lib64/libQtDBus.so;debug;/usr/lib64/libQtDBus_debug.so + +//Path to a library. +QT_QTDBUS_LIBRARY_DEBUG:FILEPATH=/usr/lib64/libQtDBus_debug.so + +//Path to a library. +QT_QTDBUS_LIBRARY_RELEASE:FILEPATH=/usr/lib64/libQtDBus.so + +//Path to a file. +QT_QTDECLARATIVE_INCLUDE_DIR:PATH=/usr/include/QtDeclarative + +//The Qt QTDECLARATIVE library +QT_QTDECLARATIVE_LIBRARY:STRING=optimized;/usr/lib64/libQtDeclarative.so;debug;/usr/lib64/libQtDeclarative_debug.so + +//Path to a library. +QT_QTDECLARATIVE_LIBRARY_DEBUG:FILEPATH=/usr/lib64/libQtDeclarative_debug.so + +//Path to a library. +QT_QTDECLARATIVE_LIBRARY_RELEASE:FILEPATH=/usr/lib64/libQtDeclarative.so + +//Path to a file. +QT_QTDESIGNERCOMPONENTS_INCLUDE_DIR:PATH=/usr/include/QtDesigner + +//The Qt QTDESIGNERCOMPONENTS library +QT_QTDESIGNERCOMPONENTS_LIBRARY:STRING=optimized;/usr/lib64/libQtDesignerComponents.so;debug;/usr/lib64/libQtDesignerComponents_debug.so + +//Path to a library. +QT_QTDESIGNERCOMPONENTS_LIBRARY_DEBUG:FILEPATH=/usr/lib64/libQtDesignerComponents_debug.so + +//Path to a library. +QT_QTDESIGNERCOMPONENTS_LIBRARY_RELEASE:FILEPATH=/usr/lib64/libQtDesignerComponents.so + +//Path to a file. +QT_QTDESIGNER_INCLUDE_DIR:PATH=/usr/include/QtDesigner + +//The Qt QTDESIGNER library +QT_QTDESIGNER_LIBRARY:STRING=optimized;/usr/lib64/libQtDesigner.so;debug;/usr/lib64/libQtDesigner_debug.so + +//Path to a library. +QT_QTDESIGNER_LIBRARY_DEBUG:FILEPATH=/usr/lib64/libQtDesigner_debug.so + +//Path to a library. +QT_QTDESIGNER_LIBRARY_RELEASE:FILEPATH=/usr/lib64/libQtDesigner.so + +//Path to a file. +QT_QTGUI_INCLUDE_DIR:PATH=/usr/include/QtGui + +//The Qt QTGUI library +QT_QTGUI_LIBRARY:STRING=optimized;/usr/lib64/libQtGui.so;debug;/usr/lib64/libQtGui_debug.so + +//Path to a library. +QT_QTGUI_LIBRARY_DEBUG:FILEPATH=/usr/lib64/libQtGui_debug.so + +//Path to a library. +QT_QTGUI_LIBRARY_RELEASE:FILEPATH=/usr/lib64/libQtGui.so + +//Path to a file. +QT_QTHELP_INCLUDE_DIR:PATH=/usr/include/QtHelp + +//The Qt QTHELP library +QT_QTHELP_LIBRARY:STRING=optimized;/usr/lib64/libQtHelp.so;debug;/usr/lib64/libQtHelp_debug.so + +//Path to a library. +QT_QTHELP_LIBRARY_DEBUG:FILEPATH=/usr/lib64/libQtHelp_debug.so + +//Path to a library. +QT_QTHELP_LIBRARY_RELEASE:FILEPATH=/usr/lib64/libQtHelp.so + +//Path to a library. +QT_QTIFF_PLUGIN_DEBUG:FILEPATH=QT_QTIFF_PLUGIN_DEBUG-NOTFOUND + +//Path to a library. +QT_QTIFF_PLUGIN_RELEASE:FILEPATH=/usr/lib64/qt4/plugins/imageformats/libqtiff.so + +//Path to a file. +QT_QTMOTIF_INCLUDE_DIR:PATH=QT_QTMOTIF_INCLUDE_DIR-NOTFOUND + +//The Qt QTMOTIF library +QT_QTMOTIF_LIBRARY:STRING= + +//Path to a library. +QT_QTMOTIF_LIBRARY_DEBUG:FILEPATH=QT_QTMOTIF_LIBRARY_DEBUG-NOTFOUND + +//Path to a library. +QT_QTMOTIF_LIBRARY_RELEASE:FILEPATH=QT_QTMOTIF_LIBRARY_RELEASE-NOTFOUND + +//Path to a file. +QT_QTMULTIMEDIA_INCLUDE_DIR:PATH=/usr/include/QtMultimedia + +//The Qt QTMULTIMEDIA library +QT_QTMULTIMEDIA_LIBRARY:STRING=optimized;/usr/lib64/libQtMultimedia.so;debug;/usr/lib64/libQtMultimedia_debug.so + +//Path to a library. +QT_QTMULTIMEDIA_LIBRARY_DEBUG:FILEPATH=/usr/lib64/libQtMultimedia_debug.so + +//Path to a library. +QT_QTMULTIMEDIA_LIBRARY_RELEASE:FILEPATH=/usr/lib64/libQtMultimedia.so + +//Path to a file. +QT_QTNETWORK_INCLUDE_DIR:PATH=/usr/include/QtNetwork + +//The Qt QTNETWORK library +QT_QTNETWORK_LIBRARY:STRING=optimized;/usr/lib64/libQtNetwork.so;debug;/usr/lib64/libQtNetwork_debug.so + +//Path to a library. +QT_QTNETWORK_LIBRARY_DEBUG:FILEPATH=/usr/lib64/libQtNetwork_debug.so + +//Path to a library. +QT_QTNETWORK_LIBRARY_RELEASE:FILEPATH=/usr/lib64/libQtNetwork.so + +//Path to a file. +QT_QTNSPLUGIN_INCLUDE_DIR:PATH=QT_QTNSPLUGIN_INCLUDE_DIR-NOTFOUND + +//The Qt QTNSPLUGIN library +QT_QTNSPLUGIN_LIBRARY:STRING= + +//Path to a library. +QT_QTNSPLUGIN_LIBRARY_DEBUG:FILEPATH=QT_QTNSPLUGIN_LIBRARY_DEBUG-NOTFOUND + +//Path to a library. +QT_QTNSPLUGIN_LIBRARY_RELEASE:FILEPATH=QT_QTNSPLUGIN_LIBRARY_RELEASE-NOTFOUND + +//Path to a file. +QT_QTOPENGL_INCLUDE_DIR:PATH=/usr/include/QtOpenGL + +//The Qt QTOPENGL library +QT_QTOPENGL_LIBRARY:STRING=optimized;/usr/lib64/libQtOpenGL.so;debug;/usr/lib64/libQtOpenGL_debug.so + +//Path to a library. +QT_QTOPENGL_LIBRARY_DEBUG:FILEPATH=/usr/lib64/libQtOpenGL_debug.so + +//Path to a library. +QT_QTOPENGL_LIBRARY_RELEASE:FILEPATH=/usr/lib64/libQtOpenGL.so + +//Path to a library. +QT_QTRACEGRAPHICSSYSTEM_PLUGIN_DEBUG:FILEPATH=QT_QTRACEGRAPHICSSYSTEM_PLUGIN_DEBUG-NOTFOUND + +//Path to a library. +QT_QTRACEGRAPHICSSYSTEM_PLUGIN_RELEASE:FILEPATH=/usr/lib64/qt4/plugins/graphicssystems/libqtracegraphicssystem.so + +//Path to a library. +QT_QTSCRIPTDBUS_PLUGIN_DEBUG:FILEPATH=QT_QTSCRIPTDBUS_PLUGIN_DEBUG-NOTFOUND + +//Path to a library. +QT_QTSCRIPTDBUS_PLUGIN_RELEASE:FILEPATH=/usr/lib64/qt4/plugins/script/libqtscriptdbus.so + +//Path to a file. +QT_QTSCRIPTTOOLS_INCLUDE_DIR:PATH=/usr/include/QtScriptTools + +//The Qt QTSCRIPTTOOLS library +QT_QTSCRIPTTOOLS_LIBRARY:STRING=optimized;/usr/lib64/libQtScriptTools.so;debug;/usr/lib64/libQtScriptTools_debug.so + +//Path to a library. +QT_QTSCRIPTTOOLS_LIBRARY_DEBUG:FILEPATH=/usr/lib64/libQtScriptTools_debug.so + +//Path to a library. +QT_QTSCRIPTTOOLS_LIBRARY_RELEASE:FILEPATH=/usr/lib64/libQtScriptTools.so + +//Path to a file. +QT_QTSCRIPT_INCLUDE_DIR:PATH=/usr/include/QtScript + +//The Qt QTSCRIPT library +QT_QTSCRIPT_LIBRARY:STRING=optimized;/usr/lib64/libQtScript.so;debug;/usr/lib64/libQtScript_debug.so + +//Path to a library. +QT_QTSCRIPT_LIBRARY_DEBUG:FILEPATH=/usr/lib64/libQtScript_debug.so + +//Path to a library. +QT_QTSCRIPT_LIBRARY_RELEASE:FILEPATH=/usr/lib64/libQtScript.so + +//Path to a file. +QT_QTSQL_INCLUDE_DIR:PATH=/usr/include/QtSql + +//The Qt QTSQL library +QT_QTSQL_LIBRARY:STRING=optimized;/usr/lib64/libQtSql.so;debug;/usr/lib64/libQtSql_debug.so + +//Path to a library. +QT_QTSQL_LIBRARY_DEBUG:FILEPATH=/usr/lib64/libQtSql_debug.so + +//Path to a library. +QT_QTSQL_LIBRARY_RELEASE:FILEPATH=/usr/lib64/libQtSql.so + +//Path to a file. +QT_QTSVG_INCLUDE_DIR:PATH=/usr/include/QtSvg + +//The Qt QTSVG library +QT_QTSVG_LIBRARY:STRING=optimized;/usr/lib64/libQtSvg.so;debug;/usr/lib64/libQtSvg_debug.so + +//Path to a library. +QT_QTSVG_LIBRARY_DEBUG:FILEPATH=/usr/lib64/libQtSvg_debug.so + +//Path to a library. +QT_QTSVG_LIBRARY_RELEASE:FILEPATH=/usr/lib64/libQtSvg.so + +//Path to a file. +QT_QTTEST_INCLUDE_DIR:PATH=/usr/include/QtTest + +//The Qt QTTEST library +QT_QTTEST_LIBRARY:STRING=optimized;/usr/lib64/libQtTest.so;debug;/usr/lib64/libQtTest_debug.so + +//Path to a library. +QT_QTTEST_LIBRARY_DEBUG:FILEPATH=/usr/lib64/libQtTest_debug.so + +//Path to a library. +QT_QTTEST_LIBRARY_RELEASE:FILEPATH=/usr/lib64/libQtTest.so + +//Path to a file. +QT_QTUITOOLS_INCLUDE_DIR:PATH=/usr/include/QtUiTools + +//The Qt QTUITOOLS library +QT_QTUITOOLS_LIBRARY:STRING=optimized;/usr/lib64/libQtUiTools.a;debug;/usr/lib64/libQtUiTools_debug.a + +//Path to a library. +QT_QTUITOOLS_LIBRARY_DEBUG:FILEPATH=/usr/lib64/libQtUiTools_debug.a + +//Path to a library. +QT_QTUITOOLS_LIBRARY_RELEASE:FILEPATH=/usr/lib64/libQtUiTools.a + +//Path to a library. +QT_QTWCODECS_PLUGIN_DEBUG:FILEPATH=QT_QTWCODECS_PLUGIN_DEBUG-NOTFOUND + +//Path to a library. +QT_QTWCODECS_PLUGIN_RELEASE:FILEPATH=/usr/lib64/qt4/plugins/codecs/libqtwcodecs.so + +//Path to a file. +QT_QTWEBKIT_INCLUDE_DIR:PATH=/usr/include/QtWebKit + +//The Qt QTWEBKIT library +QT_QTWEBKIT_LIBRARY:STRING=optimized;/usr/lib64/libQtWebKit.so;debug;/usr/lib64/libQtWebKit_debug.so + +//Path to a library. +QT_QTWEBKIT_LIBRARY_DEBUG:FILEPATH=/usr/lib64/libQtWebKit_debug.so + +//Path to a library. +QT_QTWEBKIT_LIBRARY_RELEASE:FILEPATH=/usr/lib64/libQtWebKit.so + +//Path to a file. +QT_QTXMLPATTERNS_INCLUDE_DIR:PATH=/usr/include/QtXmlPatterns + +//The Qt QTXMLPATTERNS library +QT_QTXMLPATTERNS_LIBRARY:STRING=optimized;/usr/lib64/libQtXmlPatterns.so;debug;/usr/lib64/libQtXmlPatterns_debug.so + +//Path to a library. +QT_QTXMLPATTERNS_LIBRARY_DEBUG:FILEPATH=/usr/lib64/libQtXmlPatterns_debug.so + +//Path to a library. +QT_QTXMLPATTERNS_LIBRARY_RELEASE:FILEPATH=/usr/lib64/libQtXmlPatterns.so + +//Path to a file. +QT_QTXML_INCLUDE_DIR:PATH=/usr/include/QtXml + +//The Qt QTXML library +QT_QTXML_LIBRARY:STRING=optimized;/usr/lib64/libQtXml.so;debug;/usr/lib64/libQtXml_debug.so + +//Path to a library. +QT_QTXML_LIBRARY_DEBUG:FILEPATH=/usr/lib64/libQtXml_debug.so + +//Path to a library. +QT_QTXML_LIBRARY_RELEASE:FILEPATH=/usr/lib64/libQtXml.so + +//Path to a library. +QT_QWEBVIEW_PLUGIN_DEBUG:FILEPATH=QT_QWEBVIEW_PLUGIN_DEBUG-NOTFOUND + +//Path to a library. +QT_QWEBVIEW_PLUGIN_RELEASE:FILEPATH=QT_QWEBVIEW_PLUGIN_RELEASE-NOTFOUND + +//Path to a library. +QT_QWSTSLIBMOUSEHANDLER_PLUGIN_DEBUG:FILEPATH=QT_QWSTSLIBMOUSEHANDLER_PLUGIN_DEBUG-NOTFOUND + +//Path to a library. +QT_QWSTSLIBMOUSEHANDLER_PLUGIN_RELEASE:FILEPATH=QT_QWSTSLIBMOUSEHANDLER_PLUGIN_RELEASE-NOTFOUND + +//Path to a program. +QT_RCC_EXECUTABLE:FILEPATH=/usr/lib64/qt4/bin/rcc + +//Path to a library. +QT_TASKMENUEXTENSION_PLUGIN_DEBUG:FILEPATH=QT_TASKMENUEXTENSION_PLUGIN_DEBUG-NOTFOUND + +//Path to a library. +QT_TASKMENUEXTENSION_PLUGIN_RELEASE:FILEPATH=/usr/lib64/qt4/plugins/designer/libtaskmenuextension.so + +//The location of the Qt translations +QT_TRANSLATIONS_DIR:PATH=/usr/share/qt4/translations + +//Path to a program. +QT_UIC3_EXECUTABLE:FILEPATH=/usr/lib64/qt4/bin/uic3 + +//Path to a program. +QT_UIC_EXECUTABLE:FILEPATH=/usr/lib64/qt4/bin/uic-qt4 + +//Path to a library. +QT_WORLDTIMECLOCKPLUGIN_PLUGIN_DEBUG:FILEPATH=QT_WORLDTIMECLOCKPLUGIN_PLUGIN_DEBUG-NOTFOUND + +//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 + +//Enable CGAL component ImageIO +WITH_CGAL_ImageIO:BOOL=ON + +//Enable CGAL component Qt3 +WITH_CGAL_Qt3:BOOL=ON + +//Enable CGAL component Qt4 +WITH_CGAL_Qt4:BOOL=ON + +//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 + +//Select external library GMPXX +WITH_GMPXX:BOOL=OFF + +//Select external library IPE +WITH_IPE:BOOL=OFF + +//Select external library LAPACK +WITH_LAPACK:BOOL=OFF + +//Select external library LEDA +WITH_LEDA:BOOL=OFF + +//Select external library MPFI +WITH_MPFI:BOOL=OFF + +//Select external library MPFR +WITH_MPFR:BOOL=ON + +//Select external library NTL +WITH_NTL:BOOL=OFF + +//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 + +//Select examples +WITH_examples:BOOL=OFF + +//Path to a file. +X11_ICE_INCLUDE_PATH:PATH=/usr/include + +//Path to a library. +X11_ICE_LIB:FILEPATH=/usr/lib64/libICE.so + +//Path to a file. +X11_SM_INCLUDE_PATH:PATH=/usr/include + +//Path to a library. +X11_SM_LIB:FILEPATH=/usr/lib64/libSM.so + +//Path to a file. +X11_X11_INCLUDE_PATH:PATH=/usr/include + +//Path to a library. +X11_X11_LIB:FILEPATH=/usr/lib64/libX11.so + +//Path to a file. +X11_XRes_INCLUDE_PATH:PATH=/usr/include + +//Path to a library. +X11_XRes_LIB:FILEPATH=/usr/lib64/libXRes.so + +//Path to a file. +X11_XShm_INCLUDE_PATH:PATH=/usr/include + +//Path to a file. +X11_XSync_INCLUDE_PATH:PATH=/usr/include + +//Path to a file. +X11_XTest_INCLUDE_PATH:PATH=/usr/include + +//Path to a library. +X11_XTest_LIB:FILEPATH=/usr/lib64/libXtst.so + +//Path to a file. +X11_Xaccessrules_INCLUDE_PATH:PATH=/usr/include + +//Path to a file. +X11_Xaccessstr_INCLUDE_PATH:PATH=/usr/include + +//Path to a file. +X11_Xau_INCLUDE_PATH:PATH=/usr/include + +//Path to a library. +X11_Xau_LIB:FILEPATH=/usr/lib64/libXau.so + +//Path to a file. +X11_Xcomposite_INCLUDE_PATH:PATH=/usr/include + +//Path to a library. +X11_Xcomposite_LIB:FILEPATH=/usr/lib64/libXcomposite.so + +//Path to a file. +X11_Xcursor_INCLUDE_PATH:PATH=/usr/include + +//Path to a library. +X11_Xcursor_LIB:FILEPATH=/usr/lib64/libXcursor.so + +//Path to a file. +X11_Xdamage_INCLUDE_PATH:PATH=/usr/include + +//Path to a library. +X11_Xdamage_LIB:FILEPATH=/usr/lib64/libXdamage.so + +//Path to a file. +X11_Xdmcp_INCLUDE_PATH:PATH=/usr/include + +//Path to a library. +X11_Xdmcp_LIB:FILEPATH=/usr/lib64/libXdmcp.so + +//Path to a library. +X11_Xext_LIB:FILEPATH=/usr/lib64/libXext.so + +//Path to a file. +X11_Xfixes_INCLUDE_PATH:PATH=/usr/include + +//Path to a library. +X11_Xfixes_LIB:FILEPATH=/usr/lib64/libXfixes.so + +//Path to a file. +X11_Xft_INCLUDE_PATH:PATH=/usr/include + +//Path to a library. +X11_Xft_LIB:FILEPATH=/usr/lib64/libXft.so + +//Path to a file. +X11_Xi_INCLUDE_PATH:PATH=/usr/include + +//Path to a library. +X11_Xi_LIB:FILEPATH=/usr/lib64/libXi.so + +//Path to a file. +X11_Xinerama_INCLUDE_PATH:PATH=/usr/include + +//Path to a library. +X11_Xinerama_LIB:FILEPATH=/usr/lib64/libXinerama.so + +//Path to a file. +X11_Xinput_INCLUDE_PATH:PATH=/usr/include + +//Path to a library. +X11_Xinput_LIB:FILEPATH=/usr/lib64/libXi.so + +//Path to a file. +X11_Xkb_INCLUDE_PATH:PATH=/usr/include + +//Path to a file. +X11_Xkbfile_INCLUDE_PATH:PATH=/usr/include + +//Path to a library. +X11_Xkbfile_LIB:FILEPATH=/usr/lib64/libxkbfile.so + +//Path to a file. +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 + +//Path to a library. +X11_Xpm_LIB:FILEPATH=/usr/lib64/libXpm.so + +//Path to a file. +X11_Xrandr_INCLUDE_PATH:PATH=/usr/include + +//Path to a library. +X11_Xrandr_LIB:FILEPATH=/usr/lib64/libXrandr.so + +//Path to a file. +X11_Xrender_INCLUDE_PATH:PATH=/usr/include + +//Path to a library. +X11_Xrender_LIB:FILEPATH=/usr/lib64/libXrender.so + +//Path to a file. +X11_Xscreensaver_INCLUDE_PATH:PATH=/usr/include + +//Path to a library. +X11_Xscreensaver_LIB:FILEPATH=/usr/lib64/libXss.so + +//Path to a file. +X11_Xshape_INCLUDE_PATH:PATH=/usr/include + +//Path to a file. +X11_Xt_INCLUDE_PATH:PATH=/usr/include + +//Path to a library. +X11_Xt_LIB:FILEPATH=/usr/lib64/libXt.so + +//Path to a file. +X11_Xutil_INCLUDE_PATH:PATH=/usr/include + +//Path to a file. +X11_Xv_INCLUDE_PATH:PATH=/usr/include + +//Path to a library. +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 + +//Path to a file. +X11_xf86misc_INCLUDE_PATH:PATH=/usr/include + +//Path to a file. +X11_xf86vmode_INCLUDE_PATH:PATH=/usr/include + +//Path to a program. +XIAR:FILEPATH=/opt/intel/composer_xe_2013.0.030/bin/intel64/xiar + +//Path to a file. +ZLIB_INCLUDE_DIR:PATH=/usr/include + +//Path to a library. +ZLIB_LIBRARY:FILEPATH=/usr/lib64/libz.so + + +######################## +# INTERNAL cache entries +######################## + +//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 +Boost_THREAD_LIBRARY-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: Boost_THREAD_LIBRARY_DEBUG +Boost_THREAD_LIBRARY_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: Boost_THREAD_LIBRARY_RELEASE +Boost_THREAD_LIBRARY_RELEASE-ADVANCED:INTERNAL=1 +//The version number for boost libraries +Boost_VERSION:INTERNAL=104900 +CGAL_3RD_PARTY_DEFINITIONS:INTERNAL= +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 +//Result of TRY_COMPILE +CGAL_CFG_ARRAY_MEMBER_INITIALIZATION_BUG_COMPILED:INTERNAL=FALSE +CGAL_CFG_DENORMALS_COMPILE_BUG:INTERNAL=0 +//Result of TRY_COMPILE +CGAL_CFG_DENORMALS_COMPILE_BUG_COMPILED:INTERNAL=TRUE +CGAL_CFG_FPU_ROUNDING_MODE_UNWINDING_VC_BUG:INTERNAL=0 +//Result of TRY_COMPILE +CGAL_CFG_FPU_ROUNDING_MODE_UNWINDING_VC_BUG_COMPILED:INTERNAL=TRUE +CGAL_CFG_IEEE_754_BUG:INTERNAL=0 +//Result of TRY_COMPILE +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_MATCHING_BUG_5:INTERNAL=0 +//Result of TRY_COMPILE +CGAL_CFG_MATCHING_BUG_5_COMPILED:INTERNAL=TRUE +CGAL_CFG_MATCHING_BUG_6:INTERNAL=0 +//Result of TRY_COMPILE +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_LIMITS:INTERNAL=0 +//Result of TRY_COMPILE +CGAL_CFG_NO_LIMITS_COMPILED:INTERNAL=TRUE +CGAL_CFG_NO_NEXTAFTER:INTERNAL=0 +//Result of TRY_COMPILE +CGAL_CFG_NO_NEXTAFTER_COMPILED:INTERNAL=TRUE +CGAL_CFG_NO_STL:INTERNAL=0 +//Result of TRY_COMPILE +CGAL_CFG_NO_STL_COMPILED:INTERNAL=TRUE +CGAL_CFG_NO_WARNING_CPP_DIRECTIVE_BUG:INTERNAL=0 +//Result of TRY_COMPILE +CGAL_CFG_NO_WARNING_CPP_DIRECTIVE_BUG_COMPILED:INTERNAL=TRUE +CGAL_CFG_NUMERIC_LIMITS_BUG:INTERNAL=0 +//Result of TRY_COMPILE +CGAL_CFG_NUMERIC_LIMITS_BUG_COMPILED:INTERNAL=TRUE +CGAL_CFG_OUTOFLINE_MEMBER_DEFINITION_BUG:INTERNAL=0 +//Result of TRY_COMPILE +CGAL_CFG_OUTOFLINE_MEMBER_DEFINITION_BUG_COMPILED:INTERNAL=TRUE +CGAL_CFG_TEMPLATE_IN_DEFAULT_PARAMETER_BUG:INTERNAL=0 +//Result of TRY_COMPILE +CGAL_CFG_TEMPLATE_IN_DEFAULT_PARAMETER_BUG_COMPILED:INTERNAL=TRUE +CGAL_CFG_TYPENAME_BEFORE_DEFAULT_ARGUMENT_BUG:INTERNAL=0 +//Result of TRY_COMPILE +CGAL_CFG_TYPENAME_BEFORE_DEFAULT_ARGUMENT_BUG_COMPILED:INTERNAL=TRUE +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-13.0beta-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 +CGAL_Core_3RD_PARTY_DEFINITIONS:INTERNAL= +CGAL_Core_3RD_PARTY_INCLUDE_DIRS:INTERNAL= +CGAL_Core_3RD_PARTY_LIBRARIES:INTERNAL= +CGAL_Core_3RD_PARTY_LIBRARIES_DIRS:INTERNAL= +//ADVANCED property for variable: CGAL_Core_LIBRARY +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 +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 +CGAL_ImageIO_3RD_PARTY_LIBRARIES_DIRS:INTERNAL= +//ADVANCED property for variable: CGAL_ImageIO_LIBRARY +CGAL_ImageIO_LIBRARY-ADVANCED:INTERNAL=1 +//Variable hidden from user +CGAL_ImageIO_LIBRARY_NAME:INTERNAL=libCGAL_ImageIO.so +CGAL_ImageIO_USE_ZLIB:INTERNAL=ON +//ADVANCED property for variable: CGAL_LIBRARY +CGAL_LIBRARY-ADVANCED:INTERNAL=1 +//Variable hidden from user +CGAL_LIBRARY_NAME:INTERNAL=libCGAL.so +CGAL_Qt3_3RD_PARTY_DEFINITIONS:INTERNAL=-DQT_SHARED;-DQT_NO_DEBUG;-DQT_THREAD_SUPPORT;-D_REENTRANT +CGAL_Qt3_3RD_PARTY_INCLUDE_DIRS:INTERNAL=/usr/lib64/qt-3.3/include;/usr/include +CGAL_Qt3_3RD_PARTY_LIBRARIES:INTERNAL=/usr/lib64/qt-3.3/lib/libqassistantclient.a;/usr/lib64/qt-3.3/lib/libqt-mt.so;/usr/lib64/libSM.so;/usr/lib64/libICE.so;/usr/lib64/libX11.so;/usr/lib64/libXext.so;dl;-lpthread;/usr/lib64/libGLU.so;/usr/lib64/libGL.so;/usr/lib64/libSM.so;/usr/lib64/libICE.so;/usr/lib64/libX11.so;/usr/lib64/libXext.so +CGAL_Qt3_3RD_PARTY_LIBRARIES_DIRS:INTERNAL= +//ADVANCED property for variable: CGAL_Qt3_LIBRARY +CGAL_Qt3_LIBRARY-ADVANCED:INTERNAL=1 +//Variable hidden from user +CGAL_Qt3_LIBRARY_NAME:INTERNAL=libCGAL_Qt3.so +CGAL_Qt4_3RD_PARTY_DEFINITIONS:INTERNAL= +CGAL_Qt4_3RD_PARTY_INCLUDE_DIRS:INTERNAL=/usr/include;/usr/include +CGAL_Qt4_3RD_PARTY_LIBRARIES:INTERNAL=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;/usr/lib64/libGLU.so;/usr/lib64/libGL.so;/usr/lib64/libSM.so;/usr/lib64/libICE.so;/usr/lib64/libX11.so;/usr/lib64/libXext.so +CGAL_Qt4_3RD_PARTY_LIBRARIES_DIRS:INTERNAL= +//ADVANCED property for variable: CGAL_Qt4_LIBRARY +CGAL_Qt4_LIBRARY-ADVANCED:INTERNAL=1 +//Variable hidden from user +CGAL_Qt4_LIBRARY_NAME:INTERNAL=libCGAL_Qt4.so +//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_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-13.0beta-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=8 +//ADVANCED property for variable: CMAKE_COLOR_MAKEFILE +CMAKE_COLOR_MAKEFILE-ADVANCED:INTERNAL=1 +//Path to CMake executable. +CMAKE_COMMAND:INTERNAL=/usr/bin/cmake +//Path to cpack program executable. +CMAKE_CPACK_COMMAND:INTERNAL=/usr/bin/cpack +//Path to ctest program executable. +CMAKE_CTEST_COMMAND:INTERNAL=/usr/bin/ctest +//ADVANCED property for variable: CMAKE_CXX_COMPILER +CMAKE_CXX_COMPILER-ADVANCED:INTERNAL=1 +CMAKE_CXX_COMPILER_WORKS:INTERNAL=1 +//ADVANCED property for variable: CMAKE_CXX_FLAGS +CMAKE_CXX_FLAGS-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_CXX_FLAGS_DEBUG +CMAKE_CXX_FLAGS_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_CXX_FLAGS_MINSIZEREL +CMAKE_CXX_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_CXX_FLAGS_RELEASE +CMAKE_CXX_FLAGS_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_CXX_FLAGS_RELWITHDEBINFO +CMAKE_CXX_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_C_COMPILER +CMAKE_C_COMPILER-ADVANCED:INTERNAL=1 +CMAKE_C_COMPILER_WORKS:INTERNAL=1 +//ADVANCED property for variable: CMAKE_C_FLAGS +CMAKE_C_FLAGS-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_C_FLAGS_DEBUG +CMAKE_C_FLAGS_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_C_FLAGS_MINSIZEREL +CMAKE_C_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_C_FLAGS_RELEASE +CMAKE_C_FLAGS_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_C_FLAGS_RELWITHDEBINFO +CMAKE_C_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 +//Result of TRY_COMPILE +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/ccmake +//Executable file format +CMAKE_EXECUTABLE_FORMAT:INTERNAL=ELF +//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS +CMAKE_EXE_LINKER_FLAGS-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_DEBUG +CMAKE_EXE_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_MINSIZEREL +CMAKE_EXE_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_RELEASE +CMAKE_EXE_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO +CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_EXPORT_COMPILE_COMMANDS +CMAKE_EXPORT_COMPILE_COMMANDS-ADVANCED:INTERNAL=1 +//Name of generator. +CMAKE_GENERATOR:INTERNAL=Unix Makefiles +//Have function connect +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 pthread.h +CMAKE_HAVE_PTHREAD_H:INTERNAL=1 +//Have function remove +CMAKE_HAVE_REMOVE:INTERNAL=1 +//Have function shmat +CMAKE_HAVE_SHMAT:INTERNAL=1 +//Start directory with the top level CMakeLists.txt file for this +// project +CMAKE_HOME_DIRECTORY:INTERNAL=/home/lrineau/CGAL/CGAL-I +//Install .so files without execute permission. +CMAKE_INSTALL_SO_NO_EXE:INTERNAL=0 +//Have library ICE +CMAKE_LIB_ICE_HAS_ICECONNECTIONNUMBER:INTERNAL=1 +//ADVANCED property for variable: CMAKE_LINKER +CMAKE_LINKER-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_MAKE_PROGRAM +CMAKE_MAKE_PROGRAM-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS +CMAKE_MODULE_LINKER_FLAGS-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_DEBUG +CMAKE_MODULE_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL +CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_RELEASE +CMAKE_MODULE_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO +CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_NM +CMAKE_NM-ADVANCED:INTERNAL=1 +//number of local generators +CMAKE_NUMBER_OF_LOCAL_GENERATORS:INTERNAL=7 +//ADVANCED property for variable: CMAKE_OBJCOPY +CMAKE_OBJCOPY-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_OBJDUMP +CMAKE_OBJDUMP-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_RANLIB +CMAKE_RANLIB-ADVANCED:INTERNAL=1 +//Path to CMake installation. +CMAKE_ROOT:INTERNAL=/usr/share/cmake +//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS +CMAKE_SHARED_LINKER_FLAGS-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_DEBUG +CMAKE_SHARED_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL +CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_RELEASE +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 +//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= -fp-model strict +//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;/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 +GMP_COMPILE_RES:INTERNAL=TRUE +//Result of TRY_RUN +GMP_RUN_RES:INTERNAL=0 +//Result of TRY_COMPILE +IntelCompiler_COMPILE_RES:INTERNAL=TRUE +//Result of TRY_RUN +IntelCompiler_RUN_RES:INTERNAL=0 +//Variable hidden from user +LIBRARY_OUTPUT_PATH:INTERNAL= +//Result of TRY_COMPILE +MPFR_COMPILE_RES:INTERNAL=TRUE +//Result of TRY_RUN +MPFR_RUN_RES:INTERNAL=0 +//Result of TRY_COMPILE +OPENGL_COMPILE_RES:INTERNAL=TRUE +//ADVANCED property for variable: OPENGL_INCLUDE_DIR +OPENGL_INCLUDE_DIR-ADVANCED:INTERNAL=1 +//Result of TRY_RUN +OPENGL_RUN_RES:INTERNAL=0 +//ADVANCED property for variable: OPENGL_gl_LIBRARY +OPENGL_gl_LIBRARY-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: OPENGL_glu_LIBRARY +OPENGL_glu_LIBRARY-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: OPENGL_xmesa_INCLUDE_DIR +OPENGL_xmesa_INCLUDE_DIR-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT3_INCLUDE_DIR +QT3_INCLUDE_DIR-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT3_MOC_EXECUTABLE +QT3_MOC_EXECUTABLE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT3_QASSISTANTCLIENT_LIBRARY +QT3_QASSISTANTCLIENT_LIBRARY-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT3_QT_LIBRARY +QT3_QT_LIBRARY-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT3_UIC_EXECUTABLE +QT3_UIC_EXECUTABLE-ADVANCED:INTERNAL=1 +//Result of TRY_COMPILE +QT4_COMPILE_RES:INTERNAL=TRUE +//Result of TRY_RUN +QT4_RUN_RES:INTERNAL=0 +//ADVANCED property for variable: QT_ARTHURPLUGIN_PLUGIN_DEBUG +QT_ARTHURPLUGIN_PLUGIN_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_ARTHURPLUGIN_PLUGIN_RELEASE +QT_ARTHURPLUGIN_PLUGIN_RELEASE-ADVANCED:INTERNAL=1 +QT_BINARY_DIR:INTERNAL=/usr/lib64/qt4/bin +//Result of TRY_COMPILE +QT_COMPILE_RES:INTERNAL=TRUE +//ADVANCED property for variable: QT_CONTAINEREXTENSION_PLUGIN_DEBUG +QT_CONTAINEREXTENSION_PLUGIN_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_CONTAINEREXTENSION_PLUGIN_RELEASE +QT_CONTAINEREXTENSION_PLUGIN_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_CUSTOMWIDGETPLUGIN_PLUGIN_DEBUG +QT_CUSTOMWIDGETPLUGIN_PLUGIN_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_CUSTOMWIDGETPLUGIN_PLUGIN_RELEASE +QT_CUSTOMWIDGETPLUGIN_PLUGIN_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_DBUSCPP2XML_EXECUTABLE +QT_DBUSCPP2XML_EXECUTABLE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_DBUSXML2CPP_EXECUTABLE +QT_DBUSXML2CPP_EXECUTABLE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_DESIGNER_EXECUTABLE +QT_DESIGNER_EXECUTABLE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_DOC_DIR +QT_DOC_DIR-ADVANCED:INTERNAL=1 +QT_HEADERS_DIR:INTERNAL=/usr/include +//ADVANCED property for variable: QT_IMPORTS_DIR +QT_IMPORTS_DIR-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_LIBRARY_DIR +QT_LIBRARY_DIR-ADVANCED:INTERNAL=1 +//Qt library dir +QT_LIBRARY_DIR:INTERNAL=/usr/lib64 +//ADVANCED property for variable: QT_LINGUIST_EXECUTABLE +QT_LINGUIST_EXECUTABLE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_LRELEASE_EXECUTABLE +QT_LRELEASE_EXECUTABLE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_LUPDATE_EXECUTABLE +QT_LUPDATE_EXECUTABLE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_MKSPECS_DIR +QT_MKSPECS_DIR-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_MOC_EXECUTABLE +QT_MOC_EXECUTABLE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_PHONONWIDGETS_PLUGIN_DEBUG +QT_PHONONWIDGETS_PLUGIN_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_PHONONWIDGETS_PLUGIN_RELEASE +QT_PHONONWIDGETS_PLUGIN_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_PHONON_INCLUDE_DIR +QT_PHONON_INCLUDE_DIR-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_PHONON_LIBRARY +QT_PHONON_LIBRARY-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_PHONON_LIBRARY_DEBUG +QT_PHONON_LIBRARY_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_PHONON_LIBRARY_RELEASE +QT_PHONON_LIBRARY_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_PHONON_QT7_PLUGIN_DEBUG +QT_PHONON_QT7_PLUGIN_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_PHONON_QT7_PLUGIN_RELEASE +QT_PHONON_QT7_PLUGIN_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_PLUGINS_DIR +QT_PLUGINS_DIR-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QCNCODECS_PLUGIN_DEBUG +QT_QCNCODECS_PLUGIN_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QCNCODECS_PLUGIN_RELEASE +QT_QCNCODECS_PLUGIN_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QCOLLECTIONGENERATOR_EXECUTABLE +QT_QCOLLECTIONGENERATOR_EXECUTABLE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QCOREWLANBEARER_PLUGIN_DEBUG +QT_QCOREWLANBEARER_PLUGIN_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QCOREWLANBEARER_PLUGIN_RELEASE +QT_QCOREWLANBEARER_PLUGIN_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QDECLARATIVEVIEW_PLUGIN_DEBUG +QT_QDECLARATIVEVIEW_PLUGIN_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QDECLARATIVEVIEW_PLUGIN_RELEASE +QT_QDECLARATIVEVIEW_PLUGIN_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QDECORATIONDEFAULT_PLUGIN_DEBUG +QT_QDECORATIONDEFAULT_PLUGIN_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QDECORATIONDEFAULT_PLUGIN_RELEASE +QT_QDECORATIONDEFAULT_PLUGIN_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QDECORATIONWINDOWS_PLUGIN_DEBUG +QT_QDECORATIONWINDOWS_PLUGIN_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QDECORATIONWINDOWS_PLUGIN_RELEASE +QT_QDECORATIONWINDOWS_PLUGIN_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QGENERICBEARER_PLUGIN_DEBUG +QT_QGENERICBEARER_PLUGIN_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QGENERICBEARER_PLUGIN_RELEASE +QT_QGENERICBEARER_PLUGIN_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QGIF_PLUGIN_DEBUG +QT_QGIF_PLUGIN_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QGIF_PLUGIN_RELEASE +QT_QGIF_PLUGIN_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QGLGRAPHICSSYSTEM_PLUGIN_DEBUG +QT_QGLGRAPHICSSYSTEM_PLUGIN_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QGLGRAPHICSSYSTEM_PLUGIN_RELEASE +QT_QGLGRAPHICSSYSTEM_PLUGIN_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QICO_PLUGIN_DEBUG +QT_QICO_PLUGIN_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QICO_PLUGIN_RELEASE +QT_QICO_PLUGIN_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QIMSW_MULTI_PLUGIN_DEBUG +QT_QIMSW_MULTI_PLUGIN_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QIMSW_MULTI_PLUGIN_RELEASE +QT_QIMSW_MULTI_PLUGIN_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QJPCODECS_PLUGIN_DEBUG +QT_QJPCODECS_PLUGIN_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QJPCODECS_PLUGIN_RELEASE +QT_QJPCODECS_PLUGIN_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QJPEG_PLUGIN_DEBUG +QT_QJPEG_PLUGIN_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QJPEG_PLUGIN_RELEASE +QT_QJPEG_PLUGIN_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QKRCODECS_PLUGIN_DEBUG +QT_QKRCODECS_PLUGIN_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QKRCODECS_PLUGIN_RELEASE +QT_QKRCODECS_PLUGIN_RELEASE-ADVANCED:INTERNAL=1 +QT_QMAKE_EXECUTABLE_LAST:INTERNAL=/usr/lib64/qt-3.3/bin/qmake +//ADVANCED property for variable: QT_QMNG_PLUGIN_DEBUG +QT_QMNG_PLUGIN_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QMNG_PLUGIN_RELEASE +QT_QMNG_PLUGIN_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QSQLDB2_PLUGIN_DEBUG +QT_QSQLDB2_PLUGIN_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QSQLDB2_PLUGIN_RELEASE +QT_QSQLDB2_PLUGIN_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QSQLIBASE_PLUGIN_DEBUG +QT_QSQLIBASE_PLUGIN_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QSQLIBASE_PLUGIN_RELEASE +QT_QSQLIBASE_PLUGIN_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QSQLITE2_PLUGIN_DEBUG +QT_QSQLITE2_PLUGIN_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QSQLITE2_PLUGIN_RELEASE +QT_QSQLITE2_PLUGIN_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QSQLITE_PLUGIN_DEBUG +QT_QSQLITE_PLUGIN_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QSQLITE_PLUGIN_RELEASE +QT_QSQLITE_PLUGIN_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QSQLMYSQL_PLUGIN_DEBUG +QT_QSQLMYSQL_PLUGIN_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QSQLMYSQL_PLUGIN_RELEASE +QT_QSQLMYSQL_PLUGIN_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QSQLOCI_PLUGIN_DEBUG +QT_QSQLOCI_PLUGIN_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QSQLOCI_PLUGIN_RELEASE +QT_QSQLOCI_PLUGIN_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QSQLODBC_PLUGIN_DEBUG +QT_QSQLODBC_PLUGIN_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QSQLODBC_PLUGIN_RELEASE +QT_QSQLODBC_PLUGIN_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QSQLPSQL_PLUGIN_DEBUG +QT_QSQLPSQL_PLUGIN_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QSQLPSQL_PLUGIN_RELEASE +QT_QSQLPSQL_PLUGIN_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QSQLTDS_PLUGIN_DEBUG +QT_QSQLTDS_PLUGIN_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QSQLTDS_PLUGIN_RELEASE +QT_QSQLTDS_PLUGIN_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QSVGICON_PLUGIN_DEBUG +QT_QSVGICON_PLUGIN_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QSVGICON_PLUGIN_RELEASE +QT_QSVGICON_PLUGIN_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QSVG_PLUGIN_DEBUG +QT_QSVG_PLUGIN_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QSVG_PLUGIN_RELEASE +QT_QSVG_PLUGIN_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QT3SUPPORTWIDGETS_PLUGIN_DEBUG +QT_QT3SUPPORTWIDGETS_PLUGIN_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QT3SUPPORTWIDGETS_PLUGIN_RELEASE +QT_QT3SUPPORTWIDGETS_PLUGIN_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QT3SUPPORT_INCLUDE_DIR +QT_QT3SUPPORT_INCLUDE_DIR-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QT3SUPPORT_LIBRARY +QT_QT3SUPPORT_LIBRARY-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QT3SUPPORT_LIBRARY_DEBUG +QT_QT3SUPPORT_LIBRARY_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QT3SUPPORT_LIBRARY_RELEASE +QT_QT3SUPPORT_LIBRARY_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTACCESSIBLECOMPATWIDGETS_PLUGIN_DEBUG +QT_QTACCESSIBLECOMPATWIDGETS_PLUGIN_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTACCESSIBLECOMPATWIDGETS_PLUGIN_RELEASE +QT_QTACCESSIBLECOMPATWIDGETS_PLUGIN_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTACCESSIBLEWIDGETS_PLUGIN_DEBUG +QT_QTACCESSIBLEWIDGETS_PLUGIN_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTACCESSIBLEWIDGETS_PLUGIN_RELEASE +QT_QTACCESSIBLEWIDGETS_PLUGIN_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTASSISTANTCLIENT_INCLUDE_DIR +QT_QTASSISTANTCLIENT_INCLUDE_DIR-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTASSISTANTCLIENT_LIBRARY +QT_QTASSISTANTCLIENT_LIBRARY-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTASSISTANTCLIENT_LIBRARY_DEBUG +QT_QTASSISTANTCLIENT_LIBRARY_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTASSISTANTCLIENT_LIBRARY_RELEASE +QT_QTASSISTANTCLIENT_LIBRARY_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTASSISTANT_INCLUDE_DIR +QT_QTASSISTANT_INCLUDE_DIR-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTASSISTANT_LIBRARY +QT_QTASSISTANT_LIBRARY-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTASSISTANT_LIBRARY_DEBUG +QT_QTASSISTANT_LIBRARY_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTASSISTANT_LIBRARY_RELEASE +QT_QTASSISTANT_LIBRARY_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTCLUCENE_LIBRARY +QT_QTCLUCENE_LIBRARY-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTCLUCENE_LIBRARY_DEBUG +QT_QTCLUCENE_LIBRARY_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTCLUCENE_LIBRARY_RELEASE +QT_QTCLUCENE_LIBRARY_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTCORE_INCLUDE_DIR +QT_QTCORE_INCLUDE_DIR-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTCORE_LIBRARY +QT_QTCORE_LIBRARY-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTCORE_LIBRARY_DEBUG +QT_QTCORE_LIBRARY_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTCORE_LIBRARY_RELEASE +QT_QTCORE_LIBRARY_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTDBUS_INCLUDE_DIR +QT_QTDBUS_INCLUDE_DIR-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTDBUS_LIBRARY +QT_QTDBUS_LIBRARY-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTDBUS_LIBRARY_DEBUG +QT_QTDBUS_LIBRARY_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTDBUS_LIBRARY_RELEASE +QT_QTDBUS_LIBRARY_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTDECLARATIVE_INCLUDE_DIR +QT_QTDECLARATIVE_INCLUDE_DIR-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTDECLARATIVE_LIBRARY +QT_QTDECLARATIVE_LIBRARY-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTDECLARATIVE_LIBRARY_DEBUG +QT_QTDECLARATIVE_LIBRARY_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTDECLARATIVE_LIBRARY_RELEASE +QT_QTDECLARATIVE_LIBRARY_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTDESIGNERCOMPONENTS_INCLUDE_DIR +QT_QTDESIGNERCOMPONENTS_INCLUDE_DIR-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTDESIGNERCOMPONENTS_LIBRARY +QT_QTDESIGNERCOMPONENTS_LIBRARY-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTDESIGNERCOMPONENTS_LIBRARY_DEBUG +QT_QTDESIGNERCOMPONENTS_LIBRARY_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTDESIGNERCOMPONENTS_LIBRARY_RELEASE +QT_QTDESIGNERCOMPONENTS_LIBRARY_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTDESIGNER_INCLUDE_DIR +QT_QTDESIGNER_INCLUDE_DIR-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTDESIGNER_LIBRARY +QT_QTDESIGNER_LIBRARY-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTDESIGNER_LIBRARY_DEBUG +QT_QTDESIGNER_LIBRARY_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTDESIGNER_LIBRARY_RELEASE +QT_QTDESIGNER_LIBRARY_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTGUI_INCLUDE_DIR +QT_QTGUI_INCLUDE_DIR-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTGUI_LIBRARY +QT_QTGUI_LIBRARY-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTGUI_LIBRARY_DEBUG +QT_QTGUI_LIBRARY_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTGUI_LIBRARY_RELEASE +QT_QTGUI_LIBRARY_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTHELP_INCLUDE_DIR +QT_QTHELP_INCLUDE_DIR-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTHELP_LIBRARY +QT_QTHELP_LIBRARY-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTHELP_LIBRARY_DEBUG +QT_QTHELP_LIBRARY_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTHELP_LIBRARY_RELEASE +QT_QTHELP_LIBRARY_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTIFF_PLUGIN_DEBUG +QT_QTIFF_PLUGIN_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTIFF_PLUGIN_RELEASE +QT_QTIFF_PLUGIN_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTMOTIF_INCLUDE_DIR +QT_QTMOTIF_INCLUDE_DIR-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTMOTIF_LIBRARY +QT_QTMOTIF_LIBRARY-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTMOTIF_LIBRARY_DEBUG +QT_QTMOTIF_LIBRARY_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTMOTIF_LIBRARY_RELEASE +QT_QTMOTIF_LIBRARY_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTMULTIMEDIA_INCLUDE_DIR +QT_QTMULTIMEDIA_INCLUDE_DIR-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTMULTIMEDIA_LIBRARY +QT_QTMULTIMEDIA_LIBRARY-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTMULTIMEDIA_LIBRARY_DEBUG +QT_QTMULTIMEDIA_LIBRARY_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTMULTIMEDIA_LIBRARY_RELEASE +QT_QTMULTIMEDIA_LIBRARY_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTNETWORK_INCLUDE_DIR +QT_QTNETWORK_INCLUDE_DIR-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTNETWORK_LIBRARY +QT_QTNETWORK_LIBRARY-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTNETWORK_LIBRARY_DEBUG +QT_QTNETWORK_LIBRARY_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTNETWORK_LIBRARY_RELEASE +QT_QTNETWORK_LIBRARY_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTNSPLUGIN_INCLUDE_DIR +QT_QTNSPLUGIN_INCLUDE_DIR-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTNSPLUGIN_LIBRARY +QT_QTNSPLUGIN_LIBRARY-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTNSPLUGIN_LIBRARY_DEBUG +QT_QTNSPLUGIN_LIBRARY_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTNSPLUGIN_LIBRARY_RELEASE +QT_QTNSPLUGIN_LIBRARY_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTOPENGL_INCLUDE_DIR +QT_QTOPENGL_INCLUDE_DIR-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTOPENGL_LIBRARY +QT_QTOPENGL_LIBRARY-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTOPENGL_LIBRARY_DEBUG +QT_QTOPENGL_LIBRARY_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTOPENGL_LIBRARY_RELEASE +QT_QTOPENGL_LIBRARY_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTRACEGRAPHICSSYSTEM_PLUGIN_DEBUG +QT_QTRACEGRAPHICSSYSTEM_PLUGIN_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTRACEGRAPHICSSYSTEM_PLUGIN_RELEASE +QT_QTRACEGRAPHICSSYSTEM_PLUGIN_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTSCRIPTDBUS_PLUGIN_DEBUG +QT_QTSCRIPTDBUS_PLUGIN_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTSCRIPTDBUS_PLUGIN_RELEASE +QT_QTSCRIPTDBUS_PLUGIN_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTSCRIPTTOOLS_INCLUDE_DIR +QT_QTSCRIPTTOOLS_INCLUDE_DIR-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTSCRIPTTOOLS_LIBRARY +QT_QTSCRIPTTOOLS_LIBRARY-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTSCRIPTTOOLS_LIBRARY_DEBUG +QT_QTSCRIPTTOOLS_LIBRARY_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTSCRIPTTOOLS_LIBRARY_RELEASE +QT_QTSCRIPTTOOLS_LIBRARY_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTSCRIPT_INCLUDE_DIR +QT_QTSCRIPT_INCLUDE_DIR-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTSCRIPT_LIBRARY +QT_QTSCRIPT_LIBRARY-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTSCRIPT_LIBRARY_DEBUG +QT_QTSCRIPT_LIBRARY_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTSCRIPT_LIBRARY_RELEASE +QT_QTSCRIPT_LIBRARY_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTSQL_INCLUDE_DIR +QT_QTSQL_INCLUDE_DIR-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTSQL_LIBRARY +QT_QTSQL_LIBRARY-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTSQL_LIBRARY_DEBUG +QT_QTSQL_LIBRARY_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTSQL_LIBRARY_RELEASE +QT_QTSQL_LIBRARY_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTSVG_INCLUDE_DIR +QT_QTSVG_INCLUDE_DIR-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTSVG_LIBRARY +QT_QTSVG_LIBRARY-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTSVG_LIBRARY_DEBUG +QT_QTSVG_LIBRARY_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTSVG_LIBRARY_RELEASE +QT_QTSVG_LIBRARY_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTTEST_INCLUDE_DIR +QT_QTTEST_INCLUDE_DIR-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTTEST_LIBRARY +QT_QTTEST_LIBRARY-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTTEST_LIBRARY_DEBUG +QT_QTTEST_LIBRARY_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTTEST_LIBRARY_RELEASE +QT_QTTEST_LIBRARY_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTUITOOLS_INCLUDE_DIR +QT_QTUITOOLS_INCLUDE_DIR-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTUITOOLS_LIBRARY +QT_QTUITOOLS_LIBRARY-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTUITOOLS_LIBRARY_DEBUG +QT_QTUITOOLS_LIBRARY_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTUITOOLS_LIBRARY_RELEASE +QT_QTUITOOLS_LIBRARY_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTWCODECS_PLUGIN_DEBUG +QT_QTWCODECS_PLUGIN_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTWCODECS_PLUGIN_RELEASE +QT_QTWCODECS_PLUGIN_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTWEBKIT_INCLUDE_DIR +QT_QTWEBKIT_INCLUDE_DIR-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTWEBKIT_LIBRARY +QT_QTWEBKIT_LIBRARY-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTWEBKIT_LIBRARY_DEBUG +QT_QTWEBKIT_LIBRARY_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTWEBKIT_LIBRARY_RELEASE +QT_QTWEBKIT_LIBRARY_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTXMLPATTERNS_INCLUDE_DIR +QT_QTXMLPATTERNS_INCLUDE_DIR-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTXMLPATTERNS_LIBRARY +QT_QTXMLPATTERNS_LIBRARY-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTXMLPATTERNS_LIBRARY_DEBUG +QT_QTXMLPATTERNS_LIBRARY_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTXMLPATTERNS_LIBRARY_RELEASE +QT_QTXMLPATTERNS_LIBRARY_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTXML_INCLUDE_DIR +QT_QTXML_INCLUDE_DIR-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTXML_LIBRARY +QT_QTXML_LIBRARY-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTXML_LIBRARY_DEBUG +QT_QTXML_LIBRARY_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QTXML_LIBRARY_RELEASE +QT_QTXML_LIBRARY_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QWEBVIEW_PLUGIN_DEBUG +QT_QWEBVIEW_PLUGIN_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QWEBVIEW_PLUGIN_RELEASE +QT_QWEBVIEW_PLUGIN_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QWSTSLIBMOUSEHANDLER_PLUGIN_DEBUG +QT_QWSTSLIBMOUSEHANDLER_PLUGIN_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_QWSTSLIBMOUSEHANDLER_PLUGIN_RELEASE +QT_QWSTSLIBMOUSEHANDLER_PLUGIN_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_RCC_EXECUTABLE +QT_RCC_EXECUTABLE-ADVANCED:INTERNAL=1 +//Result of TRY_RUN +QT_RUN_RES:INTERNAL=0 +//ADVANCED property for variable: QT_TASKMENUEXTENSION_PLUGIN_DEBUG +QT_TASKMENUEXTENSION_PLUGIN_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_TASKMENUEXTENSION_PLUGIN_RELEASE +QT_TASKMENUEXTENSION_PLUGIN_RELEASE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_TRANSLATIONS_DIR +QT_TRANSLATIONS_DIR-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_UIC3_EXECUTABLE +QT_UIC3_EXECUTABLE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_UIC_EXECUTABLE +QT_UIC_EXECUTABLE-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_WORLDTIMECLOCKPLUGIN_PLUGIN_DEBUG +QT_WORLDTIMECLOCKPLUGIN_PLUGIN_DEBUG-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: QT_WORLDTIMECLOCKPLUGIN_PLUGIN_RELEASE +QT_WORLDTIMECLOCKPLUGIN_PLUGIN_RELEASE-ADVANCED:INTERNAL=1 +//Have symbol Q_WS_MAC +Q_WS_MAC:INTERNAL= +//Have symbol Q_WS_QWS +Q_WS_QWS:INTERNAL= +//Have symbol Q_WS_WIN +Q_WS_WIN:INTERNAL= +//Have symbol Q_WS_X11 +Q_WS_X11:INTERNAL=1 +//ADVANCED property for variable: X11_ICE_INCLUDE_PATH +X11_ICE_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_ICE_LIB +X11_ICE_LIB-ADVANCED:INTERNAL=1 +//Have library /usr/lib64/libX11.so;/usr/lib64/libXext.so +X11_LIB_X11_SOLO:INTERNAL=1 +//ADVANCED property for variable: X11_SM_INCLUDE_PATH +X11_SM_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_SM_LIB +X11_SM_LIB-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_X11_INCLUDE_PATH +X11_X11_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_X11_LIB +X11_X11_LIB-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_XRes_INCLUDE_PATH +X11_XRes_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_XRes_LIB +X11_XRes_LIB-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_XShm_INCLUDE_PATH +X11_XShm_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_XSync_INCLUDE_PATH +X11_XSync_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_XTest_INCLUDE_PATH +X11_XTest_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_XTest_LIB +X11_XTest_LIB-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xaccessrules_INCLUDE_PATH +X11_Xaccessrules_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xaccessstr_INCLUDE_PATH +X11_Xaccessstr_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xau_INCLUDE_PATH +X11_Xau_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xau_LIB +X11_Xau_LIB-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xcomposite_INCLUDE_PATH +X11_Xcomposite_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xcomposite_LIB +X11_Xcomposite_LIB-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xcursor_INCLUDE_PATH +X11_Xcursor_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xcursor_LIB +X11_Xcursor_LIB-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xdamage_INCLUDE_PATH +X11_Xdamage_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xdamage_LIB +X11_Xdamage_LIB-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xdmcp_INCLUDE_PATH +X11_Xdmcp_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xdmcp_LIB +X11_Xdmcp_LIB-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xext_LIB +X11_Xext_LIB-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xfixes_INCLUDE_PATH +X11_Xfixes_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xfixes_LIB +X11_Xfixes_LIB-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xft_INCLUDE_PATH +X11_Xft_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xft_LIB +X11_Xft_LIB-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xi_INCLUDE_PATH +X11_Xi_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xi_LIB +X11_Xi_LIB-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xinerama_INCLUDE_PATH +X11_Xinerama_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xinerama_LIB +X11_Xinerama_LIB-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xinput_INCLUDE_PATH +X11_Xinput_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xinput_LIB +X11_Xinput_LIB-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xkb_INCLUDE_PATH +X11_Xkb_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xkbfile_INCLUDE_PATH +X11_Xkbfile_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xkbfile_LIB +X11_Xkbfile_LIB-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xkblib_INCLUDE_PATH +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 +X11_Xpm_LIB-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xrandr_INCLUDE_PATH +X11_Xrandr_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xrandr_LIB +X11_Xrandr_LIB-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xrender_INCLUDE_PATH +X11_Xrender_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xrender_LIB +X11_Xrender_LIB-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xscreensaver_INCLUDE_PATH +X11_Xscreensaver_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xscreensaver_LIB +X11_Xscreensaver_LIB-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xshape_INCLUDE_PATH +X11_Xshape_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xt_INCLUDE_PATH +X11_Xt_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xt_LIB +X11_Xt_LIB-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xutil_INCLUDE_PATH +X11_Xutil_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xv_INCLUDE_PATH +X11_Xv_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_Xv_LIB +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 +X11_xf86misc_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: X11_xf86vmode_INCLUDE_PATH +X11_xf86vmode_INCLUDE_PATH-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: XIAR +XIAR-ADVANCED:INTERNAL=1 +//Result of TRY_COMPILE +ZLIB_COMPILE_RES:INTERNAL=TRUE +//ADVANCED property for variable: ZLIB_INCLUDE_DIR +ZLIB_INCLUDE_DIR-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: ZLIB_LIBRARY +ZLIB_LIBRARY-ADVANCED:INTERNAL=1 +//Result of TRY_RUN +ZLIB_RUN_RES:INTERNAL=0 + diff --git a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/setup b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-13.0beta-with-g++-4.6.3-STL_F16/setup similarity index 68% rename from Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/setup rename to Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-13.0beta-with-g++-4.6.3-STL_F16/setup index 65f588e8259..f78d19cc968 100644 --- a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/setup +++ b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-13.0beta-with-g++-4.6.3-STL_F16/setup @@ -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 diff --git a/Maintenance/public_release/scripts/prepare_release b/Maintenance/public_release/scripts/prepare_release index 2117216bb65..626db7922e6 100755 --- a/Maintenance/public_release/scripts/prepare_release +++ b/Maintenance/public_release/scripts/prepare_release @@ -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" diff --git a/Maintenance/release_building/public_release_name b/Maintenance/release_building/public_release_name index 3ab64670a53..c8deeed6192 100644 --- a/Maintenance/release_building/public_release_name +++ b/Maintenance/release_building/public_release_name @@ -1 +1 @@ -CGAL-4.1-dev +CGAL-4.1-alpha1 diff --git a/Maintenance/svn_server/hooks/Mail/Sender/CType/Ext.pm b/Maintenance/svn_server/hooks/Mail/Sender/CType/Ext.pm index f190f664339..e4fe064eebc 100755 --- a/Maintenance/svn_server/hooks/Mail/Sender/CType/Ext.pm +++ b/Maintenance/svn_server/hooks/Mail/Sender/CType/Ext.pm @@ -205,4 +205,4 @@ package Mail::Sender; 1; -# list of extensions by "Guillaume A." \ No newline at end of file +# list of extensions by "Guillaume A." diff --git a/Matrix_search/include/CGAL/pierce_rectangles_2.h b/Matrix_search/include/CGAL/pierce_rectangles_2.h index 33bfe963b6b..bf263761fcf 100644 --- a/Matrix_search/include/CGAL/pierce_rectangles_2.h +++ b/Matrix_search/include/CGAL/pierce_rectangles_2.h @@ -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 = diff --git a/Matrix_search/include/CGAL/rectangular_3_center_2.h b/Matrix_search/include/CGAL/rectangular_3_center_2.h index 79a1cde94ba..b153211e06b 100644 --- a/Matrix_search/include/CGAL/rectangular_3_center_2.h +++ b/Matrix_search/include/CGAL/rectangular_3_center_2.h @@ -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 diff --git a/Matrix_search/include/CGAL/sorted_matrix_search.h b/Matrix_search/include/CGAL/sorted_matrix_search.h index ab95c20babe..78f12a93b7a 100644 --- a/Matrix_search/include/CGAL/sorted_matrix_search.h +++ b/Matrix_search/include/CGAL/sorted_matrix_search.h @@ -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; diff --git a/Mesh_2/include/CGAL/Delaunay_mesh_criteria_2.h b/Mesh_2/include/CGAL/Delaunay_mesh_criteria_2.h index 9a3a4a52a72..9adf47aa3f2 100644 --- a/Mesh_2/include/CGAL/Delaunay_mesh_criteria_2.h +++ b/Mesh_2/include/CGAL/Delaunay_mesh_criteria_2.h @@ -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(); diff --git a/Mesh_2/include/CGAL/Delaunay_mesh_size_criteria_2.h b/Mesh_2/include/CGAL/Delaunay_mesh_size_criteria_2.h index 041a0caf6cd..15b4edcf0de 100644 --- a/Mesh_2/include/CGAL/Delaunay_mesh_size_criteria_2.h +++ b/Mesh_2/include/CGAL/Delaunay_mesh_size_criteria_2.h @@ -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!! */ diff --git a/Mesh_2/include/CGAL/Mesh_2/Clusters.h b/Mesh_2/include/CGAL/Mesh_2/Clusters.h index 9193d8a830c..a14759e126c 100644 --- a/Mesh_2/include/CGAL/Mesh_2/Clusters.h +++ b/Mesh_2/include/CGAL/Mesh_2/Clusters.h @@ -296,9 +296,6 @@ public: { typedef typename Cluster_map::const_iterator Iterator; typedef std::pair Range; - typedef typename Range::first_type Clusters_iterator; - typedef Pair_get_first - Get_first; Range range = cluster_map.equal_range(vh); Iterator first = range.first; diff --git a/Mesh_3/include/CGAL/Mesh_3/Detect_features_in_polyhedra.h b/Mesh_3/include/CGAL/Mesh_3/Detect_features_in_polyhedra.h index 2e4608b8410..14bec453ffd 100644 --- a/Mesh_3/include/CGAL/Mesh_3/Detect_features_in_polyhedra.h +++ b/Mesh_3/include/CGAL/Mesh_3/Detect_features_in_polyhedra.h @@ -197,8 +197,6 @@ bool Detect_features_in_polyhedra:: 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) diff --git a/Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h b/Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h index 0f82f2da606..4605af80ba7 100644 --- a/Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h +++ b/Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h @@ -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(); diff --git a/Mesh_3/include/CGAL/Mesh_3/mesh_standard_facet_criteria.h b/Mesh_3/include/CGAL/Mesh_3/mesh_standard_facet_criteria.h index 2dc73e1762d..800e1768d5e 100644 --- a/Mesh_3/include/CGAL/Mesh_3/mesh_standard_facet_criteria.h +++ b/Mesh_3/include/CGAL/Mesh_3/mesh_standard_facet_criteria.h @@ -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; diff --git a/Mesh_3/include/CGAL/Mesh_3/radius_ratio.h b/Mesh_3/include/CGAL/Mesh_3/radius_ratio.h index d7f484071eb..539098e4506 100644 --- a/Mesh_3/include/CGAL/Mesh_3/radius_ratio.h +++ b/Mesh_3/include/CGAL/Mesh_3/radius_ratio.h @@ -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 = diff --git a/Mesh_3/include/CGAL/Mesh_complex_3_in_triangulation_3.h b/Mesh_3/include/CGAL/Mesh_complex_3_in_triangulation_3.h index 4e6a2067d0f..83fd640a10e 100644 --- a/Mesh_3/include/CGAL/Mesh_complex_3_in_triangulation_3.h +++ b/Mesh_3/include/CGAL/Mesh_complex_3_in_triangulation_3.h @@ -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(); diff --git a/Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h b/Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h index c86af513ea5..f72664a5af2 100644 --- a/Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h +++ b/Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h @@ -554,9 +554,6 @@ Polyhedral_mesh_domain_3:: Construct_initial_points::operator()(OutputIterator pts, const int n) const { - typedef boost::optional - AABB_intersection; - typename IGT::Construct_ray_3 ray = IGT().construct_ray_3_object(); typename IGT::Construct_vector_3 vector = IGT().construct_vector_3_object(); diff --git a/Mesh_3/include/CGAL/lloyd_optimize_mesh_3.h b/Mesh_3/include/CGAL/lloyd_optimize_mesh_3.h index 6ee586904b8..b75ebf3568c 100644 --- a/Mesh_3/include/CGAL/lloyd_optimize_mesh_3.h +++ b/Mesh_3/include/CGAL/lloyd_optimize_mesh_3.h @@ -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 Sizing; typedef typename Mesh_3::Lloyd_move Move; diff --git a/Mesh_3/include/CGAL/odt_optimize_mesh_3.h b/Mesh_3/include/CGAL/odt_optimize_mesh_3.h index 9585e30d41d..c89ce752cc5 100644 --- a/Mesh_3/include/CGAL/odt_optimize_mesh_3.h +++ b/Mesh_3/include/CGAL/odt_optimize_mesh_3.h @@ -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 Sizing; typedef typename Mesh_3::Odt_move Move; diff --git a/Mesh_3/include/CGAL/refine_mesh_3.h b/Mesh_3/include/CGAL/refine_mesh_3.h index 5e59356a2b4..edcfe5b4d10 100644 --- a/Mesh_3/include/CGAL/refine_mesh_3.h +++ b/Mesh_3/include/CGAL/refine_mesh_3.h @@ -310,7 +310,6 @@ void refine_mesh_3_impl(C3T3& c3t3, bool reset_c3t3) { typedef Mesh_3::Mesher_3 Mesher; - typedef typename C3T3::Triangulation::Geom_traits Gt; // Reset c3t3 (i.e. remove weights) if needed if ( reset_c3t3 ) diff --git a/Minkowski_sum_2/include/CGAL/offset_polygon_2.h b/Minkowski_sum_2/include/CGAL/offset_polygon_2.h index 546e1fb6389..803ace280a6 100644 --- a/Minkowski_sum_2/include/CGAL/offset_polygon_2.h +++ b/Minkowski_sum_2/include/CGAL/offset_polygon_2.h @@ -150,7 +150,6 @@ inset_polygon_2 (const Polygon_2 Base; typedef Offset_by_convolution_2 Exact_offset_2; - typedef typename Exact_offset_2::Offset_polygon_2 Offset_polygon_2; Base base; Exact_offset_2 exact_offset (base); diff --git a/Modular_arithmetic/include/CGAL/Modular_arithmetic/Residue_type.h b/Modular_arithmetic/include/CGAL/Modular_arithmetic/Residue_type.h index 2d4f718d554..e615d1efbdc 100644 --- a/Modular_arithmetic/include/CGAL/Modular_arithmetic/Residue_type.h +++ b/Modular_arithmetic/include/CGAL/Modular_arithmetic/Residue_type.h @@ -306,14 +306,13 @@ inline std::ostream& operator << (std::ostream& os, const Residue& p) { } inline std::istream& operator >> (std::istream& is, Residue& p) { - typedef Residue RES; char ch; int prime; is >> p.x(); is >> ch; // read the % is >> prime; // read the prime - CGAL_precondition(prime==RES::get_current_prime()); + CGAL_precondition(prime==Residue::get_current_prime()); return is; } diff --git a/Nef_2/include/CGAL/Nef_2/PM_const_decorator.h b/Nef_2/include/CGAL/Nef_2/PM_const_decorator.h index 946f3313e3e..300075d452b 100644 --- a/Nef_2/include/CGAL/Nef_2/PM_const_decorator.h +++ b/Nef_2/include/CGAL/Nef_2/PM_const_decorator.h @@ -432,8 +432,6 @@ check_integrity_and_topological_planarity(bool faces) const EI(halfedges_begin(),halfedges_end(),'e'); Object_index FI(faces_begin(),faces_end(),'f'); - typedef Halfedge_around_vertex_const_circulator hvc_circulator; - typedef Halfedge_around_face_const_circulator hfc_circulator; Vertex_const_handle vit, vend = phds->vertices_end(); int iso_vert_num=0; /* check the source links of out edges and count isolated vertices */ diff --git a/Nef_3/include/CGAL/Nef_3/K3_tree.h b/Nef_3/include/CGAL/Nef_3/K3_tree.h index c7c36c4725d..54f394ccef8 100644 --- a/Nef_3/include/CGAL/Nef_3/K3_tree.h +++ b/Nef_3/include/CGAL/Nef_3/K3_tree.h @@ -782,10 +782,6 @@ public: typedef typename SNC_structure::Vertex_iterator Vertex_iterator; typedef typename SNC_structure::Halfedge_iterator Halfedge_iterator; typedef typename SNC_structure::Halffacet_iterator Halffacet_iterator; - typedef typename SNC_structure::Halffacet_cycle_iterator - Halffacet_cycle_iterator; - typedef typename SNC_structure::SHalfedge_around_facet_circulator - SHalfedge_around_facet_circulator; CGAL_assertion( W != NULL); Object_list objects; @@ -799,7 +795,11 @@ public: objects.push_back(make_object(Halfedge_handle(e))); CGAL_forall_facets( f, *W) { #ifdef CGAL_NEF3_TRIANGULATE_FACETS - + typedef typename SNC_structure::SHalfedge_around_facet_circulator + SHalfedge_around_facet_circulator; + typedef typename SNC_structure::Halffacet_cycle_iterator + Halffacet_cycle_iterator; + Halffacet_cycle_iterator fci = f->facet_cycles_begin(); CGAL_assertion(fci.is_shalfedge()); SHalfedge_around_facet_circulator safc(fci); diff --git a/Nef_3/include/CGAL/Nef_3/SNC_constructor.h b/Nef_3/include/CGAL/Nef_3/SNC_constructor.h index 4d96ec6c528..3bbc14028ee 100644 --- a/Nef_3/include/CGAL/Nef_3/SNC_constructor.h +++ b/Nef_3/include/CGAL/Nef_3/SNC_constructor.h @@ -498,7 +498,6 @@ public: Vertex_handle create_from_plane(const Plane_3& pl, const Point_3& p, const Mark& bnd, const Mark& in, const Mark& out) const { - typedef typename CGAL::SNC_const_decorator SNC_const_decorator; Vertex_handle v = this->sncp()->new_vertex( p, bnd); v->point() = p; Sphere_circle c(pl); // circle through origin parallel to h diff --git a/Nef_3/include/CGAL/Nef_3/SNC_io_parser.h b/Nef_3/include/CGAL/Nef_3/SNC_io_parser.h index 031349c7d2c..d1a0659e55a 100644 --- a/Nef_3/include/CGAL/Nef_3/SNC_io_parser.h +++ b/Nef_3/include/CGAL/Nef_3/SNC_io_parser.h @@ -712,7 +712,6 @@ class Geometry_io { void print_point(std::ostream& out, const CGAL::Point_3 p) { typedef Fraction_traits FracTraits; typedef std::vector NV; - typedef typename NV::iterator NV_iter; typename FracTraits::Numerator_type num; typename FracTraits::Denominator_type denom; @@ -745,7 +744,6 @@ class Geometry_io { typedef Fraction_traits FracTraits; typedef typename FracTraits::Numerator_type NumType; typedef std::vector NV; - typedef typename NV::iterator NV_iter; typename FracTraits::Numerator_type num; typename FracTraits::Denominator_type denom; @@ -774,7 +772,6 @@ class Geometry_io { void print_plane(std::ostream& out, const CGAL::Plane_3 p) { typedef Fraction_traits FracTraits; typedef std::vector NV; - typedef typename NV::iterator NV_iter; typename FracTraits::Numerator_type num; typename FracTraits::Denominator_type denom; diff --git a/Nef_3/include/CGAL/Nef_3/polyhedron_3_to_nef_3.h b/Nef_3/include/CGAL/Nef_3/polyhedron_3_to_nef_3.h index dabe13acf28..7485c2db142 100644 --- a/Nef_3/include/CGAL/Nef_3/polyhedron_3_to_nef_3.h +++ b/Nef_3/include/CGAL/Nef_3/polyhedron_3_to_nef_3.h @@ -179,7 +179,6 @@ void polyhedron_3_to_nef_3(Polyhedron_& P, SNC_structure& S) typedef Polyhedron_ Polyhedron; typedef typename Polyhedron::Facet::Plane_3 Plane; typedef typename Polyhedron::Traits::Kernel Kernel; - typedef typename SNC_structure::SNC_decorator SNC_decorator; typedef typename SNC_structure::SM_decorator SM_decorator; typedef typename SNC_structure::Vertex_handle Vertex_handle; typedef typename SNC_structure::SVertex_handle SVertex_handle; @@ -187,7 +186,6 @@ void polyhedron_3_to_nef_3(Polyhedron_& P, SNC_structure& S) typedef typename SNC_structure::SFace_handle SFace_handle; typedef typename SNC_structure::Point_3 Point_3; typedef typename SNC_structure::Sphere_point Sphere_point; - typedef typename SNC_structure::Sphere_segment Sphere_segment; typedef typename SNC_structure::Sphere_circle Sphere_circle; typedef typename Polyhedron::Halfedge_around_vertex_const_circulator diff --git a/Nef_3/include/CGAL/Nef_3/vertex_cycle_to_nef_3.h b/Nef_3/include/CGAL/Nef_3/vertex_cycle_to_nef_3.h index 6eaadeaaeb0..cc94a91d4f6 100644 --- a/Nef_3/include/CGAL/Nef_3/vertex_cycle_to_nef_3.h +++ b/Nef_3/include/CGAL/Nef_3/vertex_cycle_to_nef_3.h @@ -158,16 +158,10 @@ bool projected_vertex_cycle_to_nef_3 (typename Nef_3::SNC_structure &snc, typedef typename SNC_structure::SHalfedge_handle SHalfedge_handle; typedef typename SNC_structure::SFace_handle SFace_handle; - typedef typename SNC_structure::Kernel Kernel; - typedef typename SNC_structure::Point_3 Point_3; typedef typename std::pair Point_pair; typedef Compare_cpte Compare_edge; - typedef CGAL::SNC_point_locator_by_spatial_subdivision - > Point_locator; - typedef typename SNC_structure::Items Items; - typedef CGAL::SNC_constructor SNC_constructor; // declarations and defaults II v_it, v_pred_it; diff --git a/Nef_S2/include/CGAL/Nef_S2/Normalizing.h b/Nef_S2/include/CGAL/Nef_S2/Normalizing.h index 78327116903..ffec451d27d 100644 --- a/Nef_S2/include/CGAL/Nef_S2/Normalizing.h +++ b/Nef_S2/include/CGAL/Nef_S2/Normalizing.h @@ -291,8 +291,7 @@ class Normalizing { typedef typename R::FT FT; typedef Fraction_traits FracTraits; typedef std::vector NV; - typedef typename NV::iterator NV_iter; - + typename FracTraits::Numerator_type num; typename FracTraits::Denominator_type denom; typename FracTraits::Decompose decomposer; diff --git a/Nef_S2/include/CGAL/Nef_S2/SM_const_decorator.h b/Nef_S2/include/CGAL/Nef_S2/SM_const_decorator.h index b674c70f59a..531a7018eaf 100644 --- a/Nef_S2/include/CGAL/Nef_S2/SM_const_decorator.h +++ b/Nef_S2/include/CGAL/Nef_S2/SM_const_decorator.h @@ -294,8 +294,6 @@ check_integrity_and_topological_planarity(bool faces) const EI(shalfedges_begin(),shalfedges_end(),'e'); Object_index FI(sfaces_begin(),sfaces_end(),'f'); - typedef SHalfedge_around_svertex_const_circulator hvc_circulator; - typedef SHalfedge_around_sface_const_circulator hfc_circulator; SVertex_const_handle v; int iso_vert_num=0; /* check the source links of out edges and count isolated vertices */ diff --git a/Number_types/include/CGAL/Sqrt_extension/Sqrt_extension_type.h b/Number_types/include/CGAL/Sqrt_extension/Sqrt_extension_type.h index fd94d82dc34..e5c5ec41246 100644 --- a/Number_types/include/CGAL/Sqrt_extension/Sqrt_extension_type.h +++ b/Number_types/include/CGAL/Sqrt_extension/Sqrt_extension_type.h @@ -267,10 +267,12 @@ public: { if (! is_extended_) return CGAL_NTS to_interval(a0_); - CGAL::Interval_nt::Protector p; + const CGAL::Interval_nt& a0_int = CGAL_NTS to_interval(a0_); const CGAL::Interval_nt& a1_int = CGAL_NTS to_interval(a1_); const CGAL::Interval_nt& root_int = CGAL_NTS to_interval(root_); + + CGAL::Interval_nt::Protector p; const CGAL::Interval_nt& x_int = a0_int + (a1_int * CGAL::sqrt(root_int)); diff --git a/Partition_2/include/CGAL/Partition_2/partition_approx_convex_2.h b/Partition_2/include/CGAL/Partition_2/partition_approx_convex_2.h index 6ceb3518a73..fbb8f81ff20 100644 --- a/Partition_2/include/CGAL/Partition_2/partition_approx_convex_2.h +++ b/Partition_2/include/CGAL/Partition_2/partition_approx_convex_2.h @@ -135,7 +135,6 @@ OutputIterator partition_approx_convex_2(InputIterator first, typedef Triangulation_indirect_traits_2 Gt; typedef Constrained_triangulation_2 Constrained_tri_2; - typedef typename Constrained_tri_2::Edge_iterator Edge_iterator; typedef typename Constrained_tri_2::Edge_circulator Edge_circulator; typedef typename Constrained_tri_2::Vertex_iterator Tri_vertex_iterator; typedef typename Constrained_tri_2::Vertex_handle Vertex_handle; diff --git a/Partition_2/include/CGAL/Partition_2/partition_greene_approx_convex_2.h b/Partition_2/include/CGAL/Partition_2/partition_greene_approx_convex_2.h index ed22f628f78..55bf5186f72 100644 --- a/Partition_2/include/CGAL/Partition_2/partition_greene_approx_convex_2.h +++ b/Partition_2/include/CGAL/Partition_2/partition_greene_approx_convex_2.h @@ -361,7 +361,6 @@ void change_top_chain(Polygon& polygon, { std::copy(new_point_ref, stack.before_front(), std::back_inserter(new_polygon)); - typedef typename Polygon::iterator iterator; erase_vertices(top_chain.front(), stack.front(), polygon, update_required); top_chain.push_front(stack.front()); @@ -801,7 +800,6 @@ OutputIterator partition_greene_approx_convex_2(InputIterator first, { if (first == beyond) return result; - typedef typename Traits::Point_2 Point_2; typedef typename Traits::Polygon_2 Polygon_2; #if defined(CGAL_PARTITION_NO_POSTCONDITIONS) || \ diff --git a/Partition_2/include/CGAL/Partition_2/partition_optimal_convex_2.h b/Partition_2/include/CGAL/Partition_2/partition_optimal_convex_2.h index 97d05a90213..c5de9916a5a 100644 --- a/Partition_2/include/CGAL/Partition_2/partition_optimal_convex_2.h +++ b/Partition_2/include/CGAL/Partition_2/partition_optimal_convex_2.h @@ -205,7 +205,6 @@ bool collinearly_visible(unsigned int edge_num1, unsigned int e_num, const Polygon& polygon, const Traits& traits) { - typedef typename Polygon::size_type size_type; typedef typename Traits::Orientation_2 Orientation_2; Orientation_2 orientation = traits.orientation_2_object(); @@ -447,7 +446,6 @@ void partition_opt_cvx_preprocessing(Polygon& polygon, { typedef typename Polygon::size_type size_type; - typedef typename Polygon::iterator Vertex_iterator; typedef Vertex_visibility_graph_2 Vis_graph; typedef typename Traits::Point_2 Point_2; typedef std::pair Point_pair; diff --git a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3.h b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3.h index 0d93bc25728..4d9b1720a0f 100644 --- a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3.h +++ b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3.h @@ -2532,7 +2532,6 @@ inline void Periodic_3_triangulation_3::periodic_remove(Vertex_handle v, // with the facet just behind typedef std::map Vertex_triple_Facet_map; typedef PointRemover Point_remover; - typedef typename Point_remover::TDSE TDSE; typedef typename Point_remover::CellE_handle CellE_handle; typedef typename Point_remover::VertexE_handle VertexE_handle; typedef typename Point_remover::FacetE FacetE; @@ -2541,8 +2540,6 @@ inline void Periodic_3_triangulation_3::periodic_remove(Vertex_handle v, Finite_cellsE_iterator; typedef typename Point_remover::Vertex_triple_FacetE_map Vertex_triple_FacetE_map; - typedef typename Point_remover::Vertex_triple_FacetE_map_it - Vertex_triple_FacetE_map_it; // First compute the hole and its boundary vertices. std::vector hole; @@ -3020,7 +3017,6 @@ Periodic_3_triangulation_3::convert_to_27_sheeted_covering() { Virtual_cell_map; typedef std::map > Virtual_cell_reverse_map; - typedef typename Virtual_cell_map::const_iterator VCMIT; typedef typename Virtual_cell_reverse_map::const_iterator VCRMIT; Virtual_cell_map virtual_cells; @@ -3555,8 +3551,6 @@ operator<< (std::ostream& os,const Periodic_3_triangulation_3 &tr) typedef typename Triangulation::Vertex_iterator Vertex_iterator; typedef typename Triangulation::Cell_handle Cell_handle; typedef typename Triangulation::Cell_iterator Cell_iterator; - typedef typename Triangulation::Edge_iterator Edge_iterator; - typedef typename Triangulation::Facet_iterator Facet_iterator; typedef typename Triangulation::Covering_sheets Covering_sheets; typedef typename Triangulation::Offset Offset; typedef typename Triangulation::Virtual_vertex_map_it Virtual_vertex_map_it; @@ -3754,9 +3748,9 @@ operator==(const Periodic_3_triangulation_3 &t1, typedef typename Periodic_3_triangulation_3::Point Point; typedef typename Periodic_3_triangulation_3::Offset Offset; - typedef typename Periodic_3_triangulation_3 - ::Geometric_traits::Compare_xyz_3 Compare_xyz_3; - + + // typedef typename Periodic_3_triangulation_3 + // ::Geometric_traits::Compare_xyz_3 Compare_xyz_3; // Compare_xyz_3 cmp1 = t1.geom_traits().compare_xyz_3_object(); // Compare_xyz_3 cmp2 = t2.geom_traits().compare_xyz_3_object(); diff --git a/Point_set_processing_3/include/CGAL/compute_average_spacing.h b/Point_set_processing_3/include/CGAL/compute_average_spacing.h index 5590016e650..3c253d74f3e 100644 --- a/Point_set_processing_3/include/CGAL/compute_average_spacing.h +++ b/Point_set_processing_3/include/CGAL/compute_average_spacing.h @@ -56,8 +56,6 @@ compute_average_spacing(const typename Kernel::Point_3& query, ///< 3D point who // basic geometric types typedef typename Kernel::FT FT; typedef typename Kernel::Point_3 Point; - typedef typename Kernel::Plane_3 Plane; - typedef typename Kernel::Vector_3 Vector; // types for K nearest neighbors search typedef Search_traits_3 Tree_traits; diff --git a/Point_set_processing_3/include/CGAL/jet_estimate_normals.h b/Point_set_processing_3/include/CGAL/jet_estimate_normals.h index d4a3d8f1c9d..8821033bdb8 100644 --- a/Point_set_processing_3/include/CGAL/jet_estimate_normals.h +++ b/Point_set_processing_3/include/CGAL/jet_estimate_normals.h @@ -61,7 +61,6 @@ jet_estimate_normal(const typename Kernel::Point_3& query, ///< point to compute { // basic geometric types typedef typename Kernel::Point_3 Point; - typedef typename Kernel::Vector_3 Vector; // types for K nearest neighbors search typedef typename CGAL::Search_traits_3 Tree_traits; diff --git a/Point_set_processing_3/include/CGAL/mst_orient_normals.h b/Point_set_processing_3/include/CGAL/mst_orient_normals.h index 0f13d983b80..fe6d80853bc 100644 --- a/Point_set_processing_3/include/CGAL/mst_orient_normals.h +++ b/Point_set_processing_3/include/CGAL/mst_orient_normals.h @@ -420,10 +420,6 @@ create_mst_graph( // Bring private stuff to scope using namespace internal; - // Input points types - typedef typename boost::property_traits::value_type Point; - typedef typename boost::property_traits::value_type Vector; - // Riemannian_graph types typedef internal::Riemannian_graph Riemannian_graph; typedef typename boost::property_map::const_type Riemannian_graph_weight_map; @@ -535,8 +531,6 @@ mst_orient_normals( // Input points types typedef typename std::iterator_traits::value_type Enriched_point; // actual type of input points - typedef typename boost::property_traits::value_type Vector; - // Property map ForwardIterator -> index typedef Index_property_map IndexPMap; diff --git a/Point_set_processing_3/include/CGAL/pca_estimate_normals.h b/Point_set_processing_3/include/CGAL/pca_estimate_normals.h index 31cee85f420..8a9db097ef5 100644 --- a/Point_set_processing_3/include/CGAL/pca_estimate_normals.h +++ b/Point_set_processing_3/include/CGAL/pca_estimate_normals.h @@ -62,7 +62,6 @@ pca_estimate_normal(const typename Kernel::Point_3& query, ///< point to compute // basic geometric types typedef typename Kernel::Point_3 Point; typedef typename Kernel::Plane_3 Plane; - typedef typename Kernel::Vector_3 Vector; // types for K nearest neighbors search typedef typename CGAL::Search_traits_3 Tree_traits; diff --git a/Point_set_processing_3/include/CGAL/remove_outliers.h b/Point_set_processing_3/include/CGAL/remove_outliers.h index 6ae70f9fdb6..b528695c097 100644 --- a/Point_set_processing_3/include/CGAL/remove_outliers.h +++ b/Point_set_processing_3/include/CGAL/remove_outliers.h @@ -146,7 +146,6 @@ remove_outliers( typedef typename CGAL::Search_traits_3 Tree_traits; typedef typename CGAL::Orthogonal_k_neighbor_search Neighbor_search; typedef typename Neighbor_search::Tree Tree; - typedef typename Neighbor_search::iterator Search_iterator; // precondition: at least one element in the container. // to fix: should have at least three distinct points diff --git a/Polyhedron/demo/Polyhedron/CMakeLists.txt b/Polyhedron/demo/Polyhedron/CMakeLists.txt index f9267d45797..22a56c9f5fc 100644 --- a/Polyhedron/demo/Polyhedron/CMakeLists.txt +++ b/Polyhedron/demo/Polyhedron/CMakeLists.txt @@ -129,6 +129,7 @@ if(CGAL_Qt4_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND) Scene_combinatorial_map_item.cpp Scene_polygon_soup_item.cpp Scene_polyhedron_item.cpp + Scene_polyhedron_transform_item.cpp Scene_polylines_item.cpp Scene_edit_polyhedron_item.cpp Scene_textured_polyhedron_item.cpp @@ -176,6 +177,10 @@ if(CGAL_Qt4_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND) Scene_polyhedron_item.cpp Scene_polyhedron_item.moc) target_link_libraries(scene_polyhedron_item demo_framework) + add_library(scene_polyhedron_transform_item SHARED + Scene_polyhedron_transform_item.cpp Scene_polyhedron_transform_item.moc) + target_link_libraries(scene_polyhedron_transform_item demo_framework scene_polyhedron_item) + add_library(scene_combinatorial_map_item SHARED Scene_combinatorial_map_item.cpp Scene_combinatorial_map_item.moc) target_link_libraries(scene_combinatorial_map_item demo_framework scene_polyhedron_item) @@ -316,6 +321,9 @@ if(CGAL_Qt4_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND) polyhedron_demo_plugin(xyz_plugin Polyhedron_demo_xyz_plugin) target_link_libraries(xyz_plugin scene_points_with_normal_item) + polyhedron_demo_plugin(nef_io_plugin Polyhedron_demo_io_nef_plugin) + target_link_libraries(nef_io_plugin scene_nef_polyhedron_item) + polyhedron_demo_plugin(polylines_io_plugin Polyhedron_demo_polylines_io_plugin) target_link_libraries(polylines_io_plugin scene_polylines_item) @@ -391,6 +399,9 @@ if(CGAL_Qt4_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND) polyhedron_demo_plugin(intersection_plugin Polyhedron_demo_intersection_plugin) target_link_libraries(intersection_plugin scene_polyhedron_item scene_polylines_item) + polyhedron_demo_plugin(transform_polyhedron_plugin Polyhedron_demo_transform_polyhedron_plugin) + target_link_libraries(transform_polyhedron_plugin scene_polyhedron_item scene_polyhedron_transform_item) + polyhedron_demo_plugin(corefinement_plugin Polyhedron_demo_corefinement_plugin) target_link_libraries(corefinement_plugin scene_polyhedron_item scene_combinatorial_map_item scene_polylines_item) diff --git a/Polyhedron/demo/Polyhedron/MainWindow.cpp b/Polyhedron/demo/Polyhedron/MainWindow.cpp index fa242320424..bcafbe1f20d 100644 --- a/Polyhedron/demo/Polyhedron/MainWindow.cpp +++ b/Polyhedron/demo/Polyhedron/MainWindow.cpp @@ -131,7 +131,7 @@ MainWindow::MainWindow(QWidget* parent) viewer->setScene(scene); sceneView->setModel(scene); - // setup the treeview: delegation and columns sizing... + // setup the sceneview: delegation and columns sizing... sceneView->setItemDelegate(new SceneDelegate(this)); sceneView->header()->setStretchLastSection(false); @@ -665,9 +665,46 @@ Polyhedron_demo_io_plugin_interface* MainWindow::find_loader(const QString& load void MainWindow::open(QString filename) { QFileInfo fileinfo(filename); - QString suffix=fileinfo.suffix(); - QRegExp extension_rx(tr("\\(\\*.(%1)\\)").arg(suffix));//match (*.XXX) where XXX is the extension of the input file - QRegExp allfiles_rx("\\(\\*?\\.?(\\*)\\)"); //match (*) and (*.*) + QString filename_striped=fileinfo.fileName(); + +#ifdef QT_SCRIPT_LIB + // Handles the loading of script file from the command line arguments, + // and the special command line arguments that start with "javascript:" + // or "qtscript:" + QString program; + if(filename.startsWith("javascript:")) { + program=filename.right(filename.size() - 11); + } + if(filename.startsWith("qtscript:")) { + program=filename.right(filename.size() - 9); + } + if(filename.endsWith(".js")) { + load_script(fileinfo); + return; + } + if(!program.isEmpty()) + { + { + QTextStream(stderr) << "Execution of script \"" + << filename << "\"\n"; + // << filename << "\", with following content:\n" + // << program; + } + evaluate_script(program, filename); + return; + } +#endif + + if ( !fileinfo.exists() ){ + QMessageBox::warning(this, + tr("Cannot open file"), + tr("File %1 does not exist.") + .arg(filename)); + return; + } + + //match all filters between () + QRegExp all_filters_rx("\\((.*)\\)"); // collect all io_plugins and offer them to load if the file extension match one name filter // also collect all available plugin in case of a no extension match @@ -676,10 +713,20 @@ void MainWindow::open(QString filename) Q_FOREACH(Polyhedron_demo_io_plugin_interface* io_plugin, io_plugins) { all_items << io_plugin->name(); QStringList split_filters = io_plugin->nameFilters().split(";;"); + bool stop=false; Q_FOREACH(const QString& filter, split_filters) { - if ( extension_rx.indexIn(filter) !=-1 || allfiles_rx.indexIn(filter) !=-1 ){ - selected_items << io_plugin->name(); - break; + //extract filters + if ( all_filters_rx.indexIn(filter)!=-1 ){ + Q_FOREACH(const QString& pattern,all_filters_rx.cap(1).split(' ')){ + QRegExp rx(pattern); + rx.setPatternSyntax(QRegExp::Wildcard); + if ( rx.exactMatch(filename_striped) ){ + selected_items << io_plugin->name(); + stop=true; + break; + } + } + if (stop) break; } } } @@ -702,10 +749,25 @@ void MainWindow::open(QString filename) if(!ok || loader_name.isEmpty()) { return; } - Scene_item* scene_item = load_item(filename, find_loader(loader_name)); + Scene_item* scene_item = load_item(fileinfo, find_loader(loader_name)); selectSceneItem(scene->addItem(scene_item)); } +bool MainWindow::open(QString filename, QString loader_name) { + QFileInfo fileinfo(filename); + Scene_item* item; + try { + item = load_item(fileinfo, find_loader(loader_name)); + } + catch(std::logic_error e) { + std::cerr << e.what() << std::endl; + return false; + } + selectSceneItem(scene->addItem(item)); + return true; +} + + Scene_item* MainWindow::load_item(QFileInfo fileinfo, Polyhedron_demo_io_plugin_interface* loader) { Scene_item* item = NULL; if(!fileinfo.isFile() || !fileinfo.isReadable()) { @@ -726,13 +788,18 @@ Scene_item* MainWindow::load_item(QFileInfo fileinfo, Polyhedron_demo_io_plugin_ void MainWindow::selectSceneItem(int i) { - if(i < 0) return; - if(i >= scene->numberOfEntries()) return; - - sceneView->selectionModel()->select(scene->createSelection(i), - QItemSelectionModel::ClearAndSelect); + if(i < 0 || i >= scene->numberOfEntries()) { + sceneView->selectionModel()->clearSelection(); + updateInfo(); + updateDisplayInfo(); + } + else { + sceneView->selectionModel()->select(scene->createSelection(i), + QItemSelectionModel::ClearAndSelect); + } } + void MainWindow::showSelectedPoint(double x, double y, double z) { information(QString("Selected point: (%1, %2, %3)"). @@ -914,7 +981,13 @@ void MainWindow::closeEvent(QCloseEvent *event) event->accept(); } -void MainWindow::load_script(QFileInfo info) +bool MainWindow::load_script(QString filename) +{ + QFileInfo fileinfo(filename); + return load_script(fileinfo); +} + +bool MainWindow::load_script(QFileInfo info) { #if defined(QT_SCRIPT_LIB) QString program; @@ -928,14 +1001,16 @@ void MainWindow::load_script(QFileInfo info) << "Execution of script \"" << filename << "\"\n"; evaluate_script(program, filename); + return true; } #endif + return false; } void MainWindow::on_actionLoad_Script_triggered() { #if defined(QT_SCRIPT_LIB) - QString filename = QFileDialog::getSaveFileName( + QString filename = QFileDialog::getOpenFileName( this, tr("Select a script to run..."), ".", diff --git a/Polyhedron/demo/Polyhedron/MainWindow.h b/Polyhedron/demo/Polyhedron/MainWindow.h index bb3ab2f66db..54346cbbd5c 100644 --- a/Polyhedron/demo/Polyhedron/MainWindow.h +++ b/Polyhedron/demo/Polyhedron/MainWindow.h @@ -40,11 +40,6 @@ public: MainWindow(QWidget* parent = 0); ~MainWindow(); -public slots: - void updateViewerBBox(); - - void open(QString); - /// Find an IO plugin. /// @throws `std::invalid_argument` if no loader with that argument can be found /// @returns the IO plugin associated with `loader_name` @@ -56,12 +51,22 @@ public slots: /// `std::invalid_argument` if `fileinfo` specifies an invalid file Scene_item* load_item(QFileInfo fileinfo, Polyhedron_demo_io_plugin_interface*); +public slots: + void updateViewerBBox(); + void open(QString); + + /// Open a file with a given loader, and return true iff it was successful. + /// + /// This slot is for use by scripts. + bool open(QString filename, QString loader_name); + /// Reloads an item. Expects to be called by a QAction with the /// index of the item to be reloaded as data attached to the action. /// The index must identify a valid `Scene_item`. void reload_item(); - void load_script(QFileInfo); + bool load_script(QString filename); + bool load_script(QFileInfo); void selectSceneItem(int i); void showSelectedPoint(double, double, double); diff --git a/Polyhedron/demo/Polyhedron/MainWindow.ui b/Polyhedron/demo/Polyhedron/MainWindow.ui index 820be781c58..906e94ffc53 100644 --- a/Polyhedron/demo/Polyhedron/MainWindow.ui +++ b/Polyhedron/demo/Polyhedron/MainWindow.ui @@ -627,7 +627,7 @@ - Load Script + Load &Script diff --git a/Polyhedron/demo/Polyhedron/Polyhedron_demo_io_nef_plugin.cpp b/Polyhedron/demo/Polyhedron/Polyhedron_demo_io_nef_plugin.cpp new file mode 100644 index 00000000000..8138d9e5536 --- /dev/null +++ b/Polyhedron/demo/Polyhedron/Polyhedron_demo_io_nef_plugin.cpp @@ -0,0 +1,78 @@ +#include "Scene_nef_polyhedron_item.h" + +#include "Polyhedron_demo_io_plugin_interface.h" +#include + +class Polyhedron_demo_io_nef_plugin : + public QObject, + public Polyhedron_demo_io_plugin_interface +{ + Q_OBJECT + Q_INTERFACES(Polyhedron_demo_io_plugin_interface) + +public: + QString nameFilters() const; + QString name() const { return "Polyhedron_demo_io_nef_plugin"; } + bool canLoad() const; + Scene_item* load(QFileInfo fileinfo); + + bool canSave(const Scene_item*); + bool save(const Scene_item*, QFileInfo fileinfo); +}; + +QString Polyhedron_demo_io_nef_plugin::nameFilters() const { + return "nef files (*.nef3)"; +} + +bool Polyhedron_demo_io_nef_plugin::canLoad() const { + return true; +} + + +Scene_item* +Polyhedron_demo_io_nef_plugin::load(QFileInfo fileinfo) { + //do not try file with extension different from nef3 + if (fileinfo.suffix() != "nef3") return 0; + + // Open file + std::ifstream in(fileinfo.filePath().toUtf8()); + if(!in) { + std::cerr << "Error! Cannot open file " << (const char*)fileinfo.filePath().toUtf8() << std::endl; + return NULL; + } + + // Try to read .nef3 in a polyhedron + Scene_nef_polyhedron_item* item = new Scene_nef_polyhedron_item(); + item->setName(fileinfo.baseName()); + if(!item->load(in)) + { + delete item; + return 0; + } + + return item; +} + +bool Polyhedron_demo_io_nef_plugin::canSave(const Scene_item* item) +{ + // This plugin supports polyhedrons and polygon soups + return qobject_cast(item); +} + +bool Polyhedron_demo_io_nef_plugin::save(const Scene_item* item, QFileInfo fileinfo) +{ + // This plugin supports polyhedrons and polygon soups + const Scene_nef_polyhedron_item* nef_item = + qobject_cast(item); + + if(!nef_item) + return false; + + std::ofstream out(fileinfo.filePath().toUtf8()); + + return (nef_item && nef_item->save(out)); +} + +#include +Q_EXPORT_PLUGIN2(Polyhedron_demo_io_nef_plugin, Polyhedron_demo_io_nef_plugin) +#include "Polyhedron_demo_io_nef_plugin.moc" diff --git a/Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin_cgal_code.cpp b/Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin_cgal_code.cpp index cf0ad1d1a93..b3449906d74 100644 --- a/Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin_cgal_code.cpp +++ b/Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin_cgal_code.cpp @@ -289,8 +289,6 @@ Scene_item* cgal_code_mesh_3(const Polyhedron* pMesh, // remesh - typedef Tr::Geom_traits GT; - // Set mesh criteria Facet_criteria facet_criteria(angle, sizing, approx); // angle, size, approximation Cell_criteria cell_criteria(4, tets_sizing); // radius-edge ratio, size diff --git a/Polyhedron/demo/Polyhedron/Polyhedron_demo_polylines_io_plugin.cpp b/Polyhedron/demo/Polyhedron/Polyhedron_demo_polylines_io_plugin.cpp index 7cbcfd479e4..1c34de1bf17 100644 --- a/Polyhedron/demo/Polyhedron/Polyhedron_demo_polylines_io_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Polyhedron_demo_polylines_io_plugin.cpp @@ -14,7 +14,7 @@ class Polyhedron_demo_polylines_io_plugin : public: QString name() const { return "Polyhedron_demo_polylines_io_plugin"; } - QString nameFilters() const { return "Polylines files (*.cgal)"; } + QString nameFilters() const { return "Polylines files (*.polylines.txt *.cgal)"; } bool canLoad() const; Scene_item* load(QFileInfo fileinfo); diff --git a/Polyhedron/demo/Polyhedron/Polyhedron_demo_transform_polyhedron_plugin.cpp b/Polyhedron/demo/Polyhedron/Polyhedron_demo_transform_polyhedron_plugin.cpp new file mode 100644 index 00000000000..a2585d5080c --- /dev/null +++ b/Polyhedron/demo/Polyhedron/Polyhedron_demo_transform_polyhedron_plugin.cpp @@ -0,0 +1,144 @@ +#include +#include +#include "Scene_polyhedron_transform_item.h" +#include "Polyhedron_type.h" +#include "Polyhedron_demo_plugin_interface.h" +#include "Polyhedron_demo_plugin_helper.h" + +#include "Scene_polylines_item.h" + +#include +#include +#include +#include +#include +#include +#include + +class Polyhedron_demo_transform_polyhedron_plugin : + public QObject, + public Polyhedron_demo_plugin_helper +{ + Q_OBJECT + Q_INTERFACES(Polyhedron_demo_plugin_interface) + +public: + + Polyhedron_demo_transform_polyhedron_plugin():started(false){} + + QList actions() const { + return QList() << actionTransformPolyhedron; + } + + bool applicable() const { + return qobject_cast(scene->item(scene->mainSelectionIndex())) || + qobject_cast(scene->item(scene->mainSelectionIndex())); + } + + void init(QMainWindow* mainWindow, Scene_interface* scene_interface) { + this->scene = scene_interface; + this->mw = mainWindow; + actionTransformPolyhedron = new QAction("Affine transformation of polyhedron", mw); + if(actionTransformPolyhedron) { + connect(actionTransformPolyhedron, SIGNAL(triggered()),this, SLOT(go())); + } + } + + void start(Scene_polyhedron_item*); + void end(); + +private: + + QAction* actionTransformPolyhedron; + Scene_polyhedron_transform_item* transform_item; + Scene_interface::Item_id tr_item_index; + bool started; + +public slots: + void go(); + void transformed_killed(); +}; // end class Polyhedron_demo_transform_polyhedron_plugin + +void Polyhedron_demo_transform_polyhedron_plugin::go(){ + if (!started){ + Scene_item* item = scene->item(scene->mainSelectionIndex()); + Scene_polyhedron_item* poly_item = qobject_cast(item); + if(!poly_item) return; + + started=true; + actionTransformPolyhedron->setText("Apply affine transformation"); + start(poly_item); + } + else + end(); +} + +void Polyhedron_demo_transform_polyhedron_plugin::transformed_killed(){ + started=false; + actionTransformPolyhedron->setText("Affine transformation of polyhedron"); +} + +void Polyhedron_demo_transform_polyhedron_plugin::start(Scene_polyhedron_item* poly_item){ + QApplication::setOverrideCursor(Qt::PointingHandCursor); + + Scene_polyhedron_item::Bbox bbox = poly_item->bbox(); + double x=(bbox.xmin+bbox.xmax)/2; + double y=(bbox.ymin+bbox.ymax)/2; + double z=(bbox.zmin+bbox.zmax)/2; + + transform_item = new Scene_polyhedron_transform_item(qglviewer::Vec(x,y,z),poly_item,scene); + transform_item->setManipulatable(true); + transform_item->setColor(Qt::green); + transform_item->setName(tr("Affine transformation of polyhedron")); + connect(transform_item, SIGNAL(stop()),this, SLOT(go())); + connect(transform_item, SIGNAL(killed()),this, SLOT(transformed_killed())); + tr_item_index=scene->addItem(transform_item); +} + + +struct Modifier_transform_vertices : public CGAL::Modifier_base { + typedef Polyhedron::HalfedgeDS HDS; + + CGAL::Aff_transformation_3 transform; + Kernel::Vector_3 frame_center_translation; + Modifier_transform_vertices(const GLdouble* m,const qglviewer::Vec& tr): + transform(m[0],m[4], m[8],m[12], + m[1],m[5], m[9],m[13], + m[2],m[6],m[10],m[14], + /*m[3],m[7],m[11],*/m[15]), + frame_center_translation(-tr.x,-tr.y,-tr.z) + { + CGAL_assertion(m[3]==0); + CGAL_assertion(m[7]==0); + CGAL_assertion(m[11]==0); + } + + void operator()(HDS& hds) + { + for (HDS::Vertex_iterator it=hds.vertices_begin(), + endit=hds.vertices_end();endit!=it;++it) + { + it->point() = transform( it->point() + frame_center_translation ); + } + } +}; + + +void Polyhedron_demo_transform_polyhedron_plugin::end(){ + QApplication::restoreOverrideCursor(); + const GLdouble* matrix = transform_item->manipulatedFrame()->matrix(); + Modifier_transform_vertices modifier(matrix,transform_item->center()); + Polyhedron* new_poly=new Polyhedron(*transform_item->getBase()->polyhedron()); + new_poly->delegate(modifier); + + Scene_polyhedron_item* new_item=new Scene_polyhedron_item(new_poly); + new_item->setName(tr("%1_transformed").arg(transform_item->getBase()->name())); + + scene->replaceItem(tr_item_index,new_item); + delete transform_item; +} + + +Q_EXPORT_PLUGIN2(Polyhedron_demo_transform_polyhedron_plugin, Polyhedron_demo_transform_polyhedron_plugin) + +#include "Polyhedron_demo_transform_polyhedron_plugin.moc" diff --git a/Polyhedron/demo/Polyhedron/Scene.cpp b/Polyhedron/demo/Polyhedron/Scene.cpp index 7601bdc13f0..8169c09e2c7 100644 --- a/Polyhedron/demo/Polyhedron/Scene.cpp +++ b/Polyhedron/demo/Polyhedron/Scene.cpp @@ -259,7 +259,8 @@ Scene::draw_aux(bool with_names) if(index == selected_item) CGALglcolor(item.color().lighter(120)); else - CGALglcolor(item.color()); + CGALglcolor(item.color()); + item.draw_edges(); } } if(with_names) { diff --git a/Polyhedron/demo/Polyhedron/Scene_combinatorial_map_item.cpp b/Polyhedron/demo/Polyhedron/Scene_combinatorial_map_item.cpp index ed76937449d..e8fff1c38c4 100644 --- a/Polyhedron/demo/Polyhedron/Scene_combinatorial_map_item.cpp +++ b/Polyhedron/demo/Polyhedron/Scene_combinatorial_map_item.cpp @@ -17,7 +17,6 @@ Scene_combinatorial_map_item* Scene_combinatorial_map_item::clone() const{return Kernel::Vector_3 Scene_combinatorial_map_item::compute_face_normal(Combinatorial_map_3::Dart_const_handle adart) const { typedef Combinatorial_map_3::Dart_of_orbit_const_range<1> Dart_in_facet_range; - typedef Kernel::Point_3 Point_3; typedef Kernel::Vector_3 Vector_3; Vector_3 normal = CGAL::NULL_VECTOR; diff --git a/Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp b/Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp index c2fd5f390b9..c039393b1e4 100644 --- a/Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp +++ b/Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp @@ -62,7 +62,8 @@ Scene_polyhedron_item::Scene_polyhedron_item() poly(new Polyhedron), show_only_feature_edges_m(false), facet_picking_m(false), - erase_next_picked_facet_m(false) + erase_next_picked_facet_m(false), + plugin_has_set_color_vector_m(false) { //init(); } @@ -72,7 +73,8 @@ Scene_polyhedron_item::Scene_polyhedron_item(Polyhedron* const p) poly(p), show_only_feature_edges_m(false), facet_picking_m(false), - erase_next_picked_facet_m(false) + erase_next_picked_facet_m(false), + plugin_has_set_color_vector_m(false) { init(); } @@ -82,7 +84,8 @@ Scene_polyhedron_item::Scene_polyhedron_item(const Polyhedron& p) poly(new Polyhedron(p)), show_only_feature_edges_m(false), facet_picking_m(false), - erase_next_picked_facet_m(false) + erase_next_picked_facet_m(false), + plugin_has_set_color_vector_m(false) { init(); } @@ -108,17 +111,20 @@ init() { typedef Polyhedron::Facet_iterator Facet_iterator; - // Fill indices map and get max subdomain value - int max = 0; - for(Facet_iterator fit = poly->facets_begin(), end = poly->facets_end() ; - fit != end; ++fit) + if ( !plugin_has_set_color_vector_m ) { - max = (std::max)(max, fit->patch_id()); + // Fill indices map and get max subdomain value + int max = 0; + for(Facet_iterator fit = poly->facets_begin(), end = poly->facets_end() ; + fit != end; ++fit) + { + max = (std::max)(max, fit->patch_id()); + } + + colors_.clear(); + compute_color_map(this->color(), max + 1, + std::back_inserter(colors_)); } - - colors_.clear(); - compute_color_map(this->color(), max + 1, - std::back_inserter(colors_)); } diff --git a/Polyhedron/demo/Polyhedron/Scene_polyhedron_item.h b/Polyhedron/demo/Polyhedron/Scene_polyhedron_item.h index 6cd614519ab..be73578f0e3 100644 --- a/Polyhedron/demo/Polyhedron/Scene_polyhedron_item.h +++ b/Polyhedron/demo/Polyhedron/Scene_polyhedron_item.h @@ -50,7 +50,9 @@ public: bool isFinite() const { return true; } bool isEmpty() const; Bbox bbox() const; - + std::vector& color_vector() {return colors_;} + void set_color_vector_read_only(bool on_off) {plugin_has_set_color_vector_m=on_off;} + public slots: virtual void changed(); void show_only_feature_edges(bool); @@ -84,6 +86,8 @@ private: bool show_only_feature_edges_m; bool facet_picking_m; bool erase_next_picked_facet_m; + //the following variable is used to indicate if the color vector must not be automatically updated. + bool plugin_has_set_color_vector_m; }; // end class Scene_polyhedron_item #endif // SCENE_POLYHEDRON_ITEM_H diff --git a/Polyhedron/demo/Polyhedron/Scene_polyhedron_transform_item.cpp b/Polyhedron/demo/Polyhedron/Scene_polyhedron_transform_item.cpp new file mode 100644 index 00000000000..f860213b800 --- /dev/null +++ b/Polyhedron/demo/Polyhedron/Scene_polyhedron_transform_item.cpp @@ -0,0 +1,69 @@ +#include "Scene_polyhedron_transform_item.h" +#include "Kernel_type.h" +#include "Polyhedron_type.h" + +Scene_polyhedron_transform_item::Scene_polyhedron_transform_item(const qglviewer::Vec& pos,const Scene_polyhedron_item* poly_item_,const Scene_interface* scene_interface): + poly_item(poly_item_), + scene(scene_interface), + manipulable(false), + can_clone(true), + frame(new ManipulatedFrame()), + poly(poly_item->polyhedron()), + center_(pos) { frame->setPosition(pos); } + +void Scene_polyhedron_transform_item::draw() const{ + glPushMatrix(); + glMultMatrixd(frame->matrix()); + direct_draw_edges(); + //Scene_item_with_display_list::draw(); + glPopMatrix(); +} + +void Scene_polyhedron_transform_item::direct_draw_edges() const { + typedef Kernel::Point_3 Point; + typedef Polyhedron::Edge_const_iterator Edge_iterator; + + ::glDisable(GL_LIGHTING); + ::glBegin(GL_LINES); + Edge_iterator he; + for(he = poly->edges_begin(); + he != poly->edges_end(); + he++) + { + const Point& a = he->vertex()->point(); + const Point& b = he->opposite()->vertex()->point(); + ::glVertex3d(a.x()-center_.x,a.y()-center_.y,a.z()-center_.z); + ::glVertex3d(b.x()-center_.x,b.y()-center_.y,b.z()-center_.z); + } + ::glEnd(); + ::glEnable(GL_LIGHTING); +} +QString Scene_polyhedron_transform_item::toolTip() const { + return QObject::tr("

    Affine transformation of %1

    " + "

    Keep Ctrl pressed and use the arcball to define an affine transformation.
    " + "Press S to apply the affine transformation to a copy of %1.

    ") + .arg(getBase()->name()); +} +bool Scene_polyhedron_transform_item::keyPressEvent(QKeyEvent* e){ + if (e->key()==Qt::Key_S){ + emit stop(); + return true; + } + return false; +} + +Scene_polyhedron_transform_item::Bbox +Scene_polyhedron_transform_item::bbox() const { + const Kernel::Point_3& p = *(poly->points_begin()); + CGAL::Bbox_3 bbox(p.x(), p.y(), p.z(), p.x(), p.y(), p.z()); + for(Polyhedron::Point_const_iterator it = poly->points_begin(); + it != poly->points_end(); + ++it) { + bbox = bbox + it->bbox(); + } + return Bbox(bbox.xmin(),bbox.ymin(),bbox.zmin(), + bbox.xmax(),bbox.ymax(),bbox.zmax()); +} + +#include "Scene_polyhedron_transform_item.moc" + \ No newline at end of file diff --git a/Polyhedron/demo/Polyhedron/Scene_polyhedron_transform_item.h b/Polyhedron/demo/Polyhedron/Scene_polyhedron_transform_item.h new file mode 100644 index 00000000000..17bbda34a76 --- /dev/null +++ b/Polyhedron/demo/Polyhedron/Scene_polyhedron_transform_item.h @@ -0,0 +1,51 @@ +#ifndef SCENE_POLYHEDRON_TRANSFORM_ITEM_H +#define SCENE_POLYHEDRON_TRANSFORM_ITEM_H + +#include "Scene_polyhedron_item.h" +#include "Scene_polyhedron_transform_item_config.h" +#include +#include +#include + +// This class represents a polyhedron in the OpenGL scene +class SCENE_POLYHEDRON_TRANSFORM_ITEM_EXPORT Scene_polyhedron_transform_item + : public Scene_item { +// : public Scene_item_with_display_list { + Q_OBJECT + + typedef Scene_polyhedron_item Base; + +public: + Scene_polyhedron_transform_item(const qglviewer::Vec& pos,const Scene_polyhedron_item* poly_item,const Scene_interface* scene_interface); + void direct_draw_edges() const; + Scene_item* clone() const{return NULL;} + QString toolTip() const; + void direct_draw() const {} + void draw() const; + Bbox bbox() const; + ~Scene_polyhedron_transform_item() {delete frame; emit killed();} + + bool manipulatable() const { return manipulable; } + ManipulatedFrame* manipulatedFrame() { return frame; } + void setManipulatable(bool b = true) { manipulable = b;} + const Scene_polyhedron_item* getBase() const{ return poly_item; }; + const qglviewer::Vec& center() const { return center_; } + virtual bool supportsRenderingMode(RenderingMode m) const { return m==Wireframe ; } + + virtual bool keyPressEvent(QKeyEvent*); + +private: + const Scene_polyhedron_item* poly_item; + const Scene_interface* scene; + bool manipulable; + bool can_clone; + qglviewer::ManipulatedFrame* frame; + const Polyhedron* poly; + qglviewer::Vec center_; + +signals: + void stop(); + void killed(); +}; // end class Scene_polyhedron_transform_item + +#endif // SCENE_POLYHEDRON_TRANSFORM_ITEM_H diff --git a/Polyhedron/demo/Polyhedron/Scene_polyhedron_transform_item_config.h b/Polyhedron/demo/Polyhedron/Scene_polyhedron_transform_item_config.h new file mode 100644 index 00000000000..6fc13aca501 --- /dev/null +++ b/Polyhedron/demo/Polyhedron/Scene_polyhedron_transform_item_config.h @@ -0,0 +1,10 @@ +#ifndef SCENE_POLYHEDRON_TRANSFORM_ITEM_CONFIG_H +#define SCENE_POLYHEDRON_TRANSFORM_ITEM_CONFIG_H + +#ifdef scene_polyhedron_transform_item_EXPORTS +# define SCENE_POLYHEDRON_TRANSFORM_ITEM_EXPORT Q_DECL_EXPORT +#else +# define SCENE_POLYHEDRON_TRANSFORM_ITEM_EXPORT Q_DECL_IMPORT +#endif + +#endif // SCENE_POLYHEDRON_TRANSFORM_ITEM_CONFIG_H diff --git a/Polyhedron/include/CGAL/internal/corefinement/Polyhedron_subset_extraction.h b/Polyhedron/include/CGAL/internal/corefinement/Polyhedron_subset_extraction.h index eb7d4e1c33f..e02818e21ea 100644 --- a/Polyhedron/include/CGAL/internal/corefinement/Polyhedron_subset_extraction.h +++ b/Polyhedron/include/CGAL/internal/corefinement/Polyhedron_subset_extraction.h @@ -169,7 +169,6 @@ void extract_connected_components(const Polyhedron& P,const Adjacency_criterium& typedef typename Polyhedron::Facet_const_handle Facet_const_handle; typedef ::CGAL::Union_find UF; typedef typename UF::handle UF_handle; - typedef typename UF::iterator UF_iterator; typedef std::map,Compare_handle_ptr > Result; typedef std::map > Facet_to_handle_map; diff --git a/Polyhedron/include/CGAL/intersection_of_Polyhedra_3_refinement_visitor.h b/Polyhedron/include/CGAL/intersection_of_Polyhedra_3_refinement_visitor.h index ae55dfba813..64a80ac2b1f 100644 --- a/Polyhedron/include/CGAL/intersection_of_Polyhedra_3_refinement_visitor.h +++ b/Polyhedron/include/CGAL/intersection_of_Polyhedra_3_refinement_visitor.h @@ -492,8 +492,6 @@ void sew_2_marked_darts( Combinatorial_map_3& final_map, const std::pair& indices, const std::pair& polyline_info) { - typedef boost::optional O_Dart_handle; - CGAL_precondition( dart_1->is_free(2) ); CGAL_precondition( dart_2->is_free(2) ); CGAL_precondition( final_map.is_marked(dart_1,mark_index) ); @@ -1836,7 +1834,6 @@ public: typedef typename Polyhedron::Facet_const_handle Facet_const_handle; typedef ::CGAL::Union_find UF; typedef typename UF::handle UF_handle; - typedef typename UF::iterator UF_iterator; typedef std::map,internal::Compare_handle_ptr > Result; typedef std::map > Facet_to_handle_map; diff --git a/Polynomial/include/CGAL/Polynomial/modular_gcd_utcf_algorithm_M.h b/Polynomial/include/CGAL/Polynomial/modular_gcd_utcf_algorithm_M.h index 59d014d933d..c63efc7b0e2 100644 --- a/Polynomial/include/CGAL/Polynomial/modular_gcd_utcf_algorithm_M.h +++ b/Polynomial/include/CGAL/Polynomial/modular_gcd_utcf_algorithm_M.h @@ -66,10 +66,7 @@ Polynomial modular_gcd_utcf_algorithm_M( timer_init.start(); #endif typedef Polynomial Poly; - typedef Polynomial_traits_d PT; - typedef typename PT::Innermost_coefficient_type IC; - // will paly the role of content typedef typename CGAL::Scalar_factor_traits::Scalar Scalar; diff --git a/Polynomial/include/CGAL/Polynomial/polynomial_gcd_implementations.h b/Polynomial/include/CGAL/Polynomial/polynomial_gcd_implementations.h index 059b82e6115..b72a57db85f 100644 --- a/Polynomial/include/CGAL/Polynomial/polynomial_gcd_implementations.h +++ b/Polynomial/include/CGAL/Polynomial/polynomial_gcd_implementations.h @@ -38,7 +38,6 @@ inline Polynomial gcd_utcf_UFD( Polynomial p1, Polynomial p2 ) { - typedef CGAL::Polynomial_traits_d > PT; // implemented using the subresultant algorithm for gcd computation // see [Cohen, 1993], algorithm 3.3.1 // handle trivial cases diff --git a/Polynomial/include/CGAL/Polynomial/subresultants.h b/Polynomial/include/CGAL/Polynomial/subresultants.h index 3f65194b30e..b0f6f47240b 100644 --- a/Polynomial/include/CGAL/Polynomial/subresultants.h +++ b/Polynomial/include/CGAL/Polynomial/subresultants.h @@ -39,7 +39,6 @@ namespace CGAL { typename Polynomial_traits_d::Polynomial_d B, typename Polynomial_traits_d::Polynomial_d& C) { - typedef typename Polynomial_traits_d::Polynomial_d Polynomial; typedef typename Polynomial_traits_d::Coefficient_type NT; typename CGAL::Algebraic_structure_traits::Integral_division idiv; diff --git a/Polynomial/include/CGAL/Polynomial_traits_d.h b/Polynomial/include/CGAL/Polynomial_traits_d.h index 7c2f371b04e..4f75d270232 100644 --- a/Polynomial/include/CGAL/Polynomial_traits_d.h +++ b/Polynomial/include/CGAL/Polynomial_traits_d.h @@ -1660,7 +1660,6 @@ struct Construct_innermost_coefficient_const_iterator_range typedef std::iterator_traits ITT; typedef typename ITT::value_type value_type; typedef Coercion_traits CT; - typedef typename CT::Type Type; typename PTC::Substitute_homogeneous subsh; diff --git a/Principal_component_analysis/include/CGAL/PCA_util.h b/Principal_component_analysis/include/CGAL/PCA_util.h index b7c8da16e9d..2363b3842c6 100644 --- a/Principal_component_analysis/include/CGAL/PCA_util.h +++ b/Principal_component_analysis/include/CGAL/PCA_util.h @@ -97,8 +97,6 @@ assemble_covariance_matrix_3(InputIterator first, const CGAL::Dimension_tag<2>&) { typedef typename K::FT FT; - typedef typename K::Point_3 Point; - typedef typename K::Vector_3 Vector; typedef typename K::Triangle_3 Triangle; typedef typename CGAL::Linear_algebraCd LA; typedef typename LA::Matrix Matrix; @@ -176,8 +174,6 @@ assemble_covariance_matrix_3(InputIterator first, const CGAL::Dimension_tag<3>&) { typedef typename K::FT FT; - typedef typename K::Point_3 Point; - typedef typename K::Vector_3 Vector; typedef typename K::Iso_cuboid_3 Iso_cuboid; typedef typename CGAL::Linear_algebraCd LA; typedef typename LA::Matrix Matrix; @@ -263,8 +259,6 @@ assemble_covariance_matrix_3(InputIterator first, const CGAL::Dimension_tag<2>&) { typedef typename K::FT FT; - typedef typename K::Point_3 Point; - typedef typename K::Vector_3 Vector; typedef typename K::Iso_cuboid_3 Iso_cuboid; typedef typename CGAL::Linear_algebraCd LA; typedef typename LA::Matrix Matrix; @@ -358,8 +352,6 @@ assemble_covariance_matrix_3(InputIterator first, const CGAL::Dimension_tag<3>&) { typedef typename K::FT FT; - typedef typename K::Point_3 Point; - typedef typename K::Vector_3 Vector; typedef typename K::Sphere_3 Sphere; typedef typename CGAL::Linear_algebraCd LA; typedef typename LA::Matrix Matrix; @@ -442,8 +434,6 @@ assemble_covariance_matrix_3(InputIterator first, const CGAL::Dimension_tag<2>&) { typedef typename K::FT FT; - typedef typename K::Point_3 Point; - typedef typename K::Vector_3 Vector; typedef typename K::Sphere_3 Sphere; typedef typename CGAL::Linear_algebraCd LA; typedef typename LA::Matrix Matrix; @@ -528,8 +518,6 @@ assemble_covariance_matrix_3(InputIterator first, const CGAL::Dimension_tag<3>&) { typedef typename K::FT FT; - typedef typename K::Point_3 Point; - typedef typename K::Vector_3 Vector; typedef typename K::Tetrahedron_3 Tetrahedron; typedef typename CGAL::Linear_algebraCd LA; typedef typename LA::Matrix Matrix; @@ -615,8 +603,6 @@ assemble_covariance_matrix_3(InputIterator first, const CGAL::Dimension_tag<1>&) { typedef typename K::FT FT; - typedef typename K::Point_3 Point; - typedef typename K::Vector_3 Vector; typedef typename K::Segment_3 Segment; typedef typename CGAL::Linear_algebraCd LA; typedef typename LA::Matrix Matrix; @@ -694,7 +680,6 @@ fitting_plane_3(const typename K::FT covariance[6], // covariance matrix const K& ) // kernel { typedef typename K::FT FT; - typedef typename K::Point_3 Point; typedef typename K::Plane_3 Plane; typedef typename K::Vector_3 Vector; @@ -736,7 +721,6 @@ fitting_line_3(const typename K::FT covariance[6], // covariance matrix const K&) // kernel { typedef typename K::FT FT; - typedef typename K::Point_3 Point; typedef typename K::Line_3 Line; typedef typename K::Vector_3 Vector; diff --git a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_circles_2.h b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_circles_2.h index a78d73b49d6..aa57977d187 100644 --- a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_circles_2.h +++ b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_circles_2.h @@ -54,7 +54,6 @@ linear_least_squares_fitting_2(InputIterator first, // types typedef typename K::FT FT; typedef typename K::Line_2 Line; - typedef typename K::Point_2 Point; typedef typename K::Vector_2 Vector; typedef typename K::Circle_2 Circle; typedef typename CGAL::Linear_algebraCd LA; @@ -163,7 +162,6 @@ linear_least_squares_fitting_2(InputIterator first, // types typedef typename K::FT FT; typedef typename K::Line_2 Line; - typedef typename K::Point_2 Point; typedef typename K::Vector_2 Vector; typedef typename K::Circle_2 Circle; typedef typename CGAL::Linear_algebraCd LA; diff --git a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_cuboids_3.h b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_cuboids_3.h index 18804c8b106..85ceacc72fe 100644 --- a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_cuboids_3.h +++ b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_cuboids_3.h @@ -1,10 +1,10 @@ // Copyright (c) 2005 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. @@ -109,7 +109,6 @@ linear_least_squares_fitting_3(InputIterator first, const K& k, // kernel const CGAL::Dimension_tag<1>& tag) { - typedef typename K::FT FT; typedef typename K::Segment_3 Segment; typedef typename K::Iso_cuboid_3 Iso_cuboid; @@ -153,7 +152,6 @@ linear_least_squares_fitting_3(InputIterator first, const K& k, // kernel const CGAL::Dimension_tag<0>& tag) { - typedef typename K::FT FT; typedef typename K::Point_3 Point; typedef typename K::Iso_cuboid_3 Iso_cuboid; @@ -254,7 +252,6 @@ linear_least_squares_fitting_3(InputIterator first, const K& k, // kernel const CGAL::Dimension_tag<1>& tag) { - typedef typename K::FT FT; typedef typename K::Segment_3 Segment; typedef typename K::Iso_cuboid_3 Iso_cuboid; @@ -298,7 +295,6 @@ linear_least_squares_fitting_3(InputIterator first, const K& k, // kernel const CGAL::Dimension_tag<0>& tag) { - typedef typename K::FT FT; typedef typename K::Point_3 Point; typedef typename K::Iso_cuboid_3 Iso_cuboid; diff --git a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_points_3.h b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_points_3.h index 1f65783b091..b4459bad20d 100644 --- a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_points_3.h +++ b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_points_3.h @@ -48,8 +48,6 @@ linear_least_squares_fitting_3(InputIterator first, { typedef typename K::FT FT; typedef typename K::Point_3 Point; - typedef typename K::Plane_3 Plane; - typedef typename K::Vector_3 Vector; // precondition: at least one element in the container. CGAL_precondition(first != beyond); @@ -82,8 +80,6 @@ linear_least_squares_fitting_3(InputIterator first, { typedef typename K::FT FT; typedef typename K::Point_3 Point; - typedef typename K::Line_3 Line; - typedef typename K::Vector_3 Vector; // precondition: at least one element in the container. CGAL_precondition(first != beyond); diff --git a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_rectangles_2.h b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_rectangles_2.h index 332b29632b5..7086dcc0fd2 100644 --- a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_rectangles_2.h +++ b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_rectangles_2.h @@ -54,12 +54,10 @@ linear_least_squares_fitting_2(InputIterator first, // types typedef typename K::FT FT; typedef typename K::Line_2 Line; - typedef typename K::Point_2 Point; typedef typename K::Vector_2 Vector; typedef typename K::Iso_rectangle_2 Iso_rectangle; typedef typename CGAL::Linear_algebraCd LA; typedef typename LA::Matrix Matrix; - typedef typename K::Segment_2 Segment_2; // precondition: at least one element in the container. CGAL_precondition(first != beyond); diff --git a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_segments_2.h b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_segments_2.h index 13cca1e0e40..e076e8b166b 100644 --- a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_segments_2.h +++ b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_segments_2.h @@ -54,7 +54,6 @@ linear_least_squares_fitting_2(InputIterator first, // types typedef typename K::FT FT; typedef typename K::Line_2 Line; - typedef typename K::Point_2 Point; typedef typename K::Vector_2 Vector; typedef typename K::Segment_2 Segment; typedef typename CGAL::Linear_algebraCd LA; diff --git a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_segments_3.h b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_segments_3.h index 1f0a10fb518..fd1fc76585a 100644 --- a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_segments_3.h +++ b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_segments_3.h @@ -1,10 +1,10 @@ // Copyright (c) 2005 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. @@ -75,7 +75,6 @@ linear_least_squares_fitting_3(InputIterator first, const K& k, // kernel const CGAL::Dimension_tag<0>& tag) { - typedef typename K::FT FT; typedef typename K::Segment_3 Segment; typedef typename K::Point_3 Point; @@ -139,7 +138,6 @@ linear_least_squares_fitting_3(InputIterator first, const K& k, // kernel const CGAL::Dimension_tag<0>& tag) { - typedef typename K::FT FT; typedef typename K::Segment_3 Segment; typedef typename K::Point_3 Point; diff --git a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_tetrahedra_3.h b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_tetrahedra_3.h index a2b7a73c563..c85a266b098 100644 --- a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_tetrahedra_3.h +++ b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_tetrahedra_3.h @@ -1,10 +1,10 @@ // Copyright (c) 2005 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. @@ -77,7 +77,6 @@ linear_least_squares_fitting_3(InputIterator first, const K& k, // kernel const CGAL::Dimension_tag<2>& tag) { - typedef typename K::FT FT; typedef typename K::Tetrahedron_3 Tetrahedron; typedef typename K::Triangle_3 Triangle; @@ -113,7 +112,6 @@ linear_least_squares_fitting_3(InputIterator first, const K& k, // kernel const CGAL::Dimension_tag<1>& tag) { - typedef typename K::FT FT; typedef typename K::Tetrahedron_3 Tetrahedron; typedef typename K::Segment_3 Segment; @@ -151,7 +149,6 @@ linear_least_squares_fitting_3(InputIterator first, const K& k, // kernel const CGAL::Dimension_tag<0>& tag) { - typedef typename K::FT FT; typedef typename K::Tetrahedron_3 Tetrahedron; typedef typename K::Point_3 Point; @@ -217,7 +214,6 @@ linear_least_squares_fitting_3(InputIterator first, const K& k, // kernel const CGAL::Dimension_tag<2>& tag) { - typedef typename K::FT FT; typedef typename K::Tetrahedron_3 Tetrahedron; typedef typename K::Triangle_3 Triangle; @@ -253,7 +249,6 @@ linear_least_squares_fitting_3(InputIterator first, const K& k, // kernel const CGAL::Dimension_tag<1>& tag) { - typedef typename K::FT FT; typedef typename K::Tetrahedron_3 Tetrahedron; typedef typename K::Segment_3 Segment; @@ -291,7 +286,6 @@ linear_least_squares_fitting_3(InputIterator first, const K& k, // kernel const CGAL::Dimension_tag<0>& tag) { - typedef typename K::FT FT; typedef typename K::Tetrahedron_3 Tetrahedron; typedef typename K::Point_3 Point; diff --git a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_triangles_2.h b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_triangles_2.h index 8baff3d08ff..509a9d20136 100644 --- a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_triangles_2.h +++ b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_triangles_2.h @@ -56,7 +56,6 @@ linear_least_squares_fitting_2(InputIterator first, // types typedef typename Kernel::FT FT; typedef typename Kernel::Line_2 Line; - typedef typename Kernel::Point_2 Point; typedef typename Kernel::Vector_2 Vector; typedef typename Kernel::Triangle_2 Triangle; typedef typename CGAL::Linear_algebraCd LA; diff --git a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_triangles_3.h b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_triangles_3.h index 4d9f441dcd0..835756c6f49 100644 --- a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_triangles_3.h +++ b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_triangles_3.h @@ -74,7 +74,6 @@ linear_least_squares_fitting_3(InputIterator first, const K& k, // kernel const CGAL::Dimension_tag<1>& tag) { - typedef typename K::FT FT; typedef typename K::Triangle_3 Triangle; typedef typename K::Segment_3 Segment; @@ -109,7 +108,6 @@ linear_least_squares_fitting_3(InputIterator first, const K& k, // kernel const CGAL::Dimension_tag<0>& tag) { - typedef typename K::FT FT; typedef typename K::Triangle_3 Triangle; typedef typename K::Point_3 Point; @@ -174,7 +172,6 @@ linear_least_squares_fitting_3(InputIterator first, const K& k, // kernel const CGAL::Dimension_tag<1>& tag) { - typedef typename K::FT FT; typedef typename K::Triangle_3 Triangle; typedef typename K::Segment_3 Segment; @@ -209,7 +206,6 @@ linear_least_squares_fitting_3(InputIterator first, const K& k, // kernel const CGAL::Dimension_tag<0>& tag) { - typedef typename K::FT FT; typedef typename K::Triangle_3 Triangle; typedef typename K::Point_3 Point; diff --git a/Principal_component_analysis/test/Principal_component_analysis/linear_least_squares_fitting_spheres_3.cpp b/Principal_component_analysis/test/Principal_component_analysis/linear_least_squares_fitting_spheres_3.cpp index afc400119a2..0867a9f85e6 100644 --- a/Principal_component_analysis/test/Principal_component_analysis/linear_least_squares_fitting_spheres_3.cpp +++ b/Principal_component_analysis/test/Principal_component_analysis/linear_least_squares_fitting_spheres_3.cpp @@ -31,7 +31,7 @@ int main(void) Line line; Plane plane; - Kernel kernel; + Kernel kernel; Point centroid; linear_least_squares_fitting_3(spheres.begin(),spheres.end(),line,CGAL::Dimension_tag<3>()); diff --git a/Qt_widget/include/CGAL/IO/Qt_widget_Nef_2.h b/Qt_widget/include/CGAL/IO/Qt_widget_Nef_2.h index 101701bbeba..0530101b297 100644 --- a/Qt_widget/include/CGAL/IO/Qt_widget_Nef_2.h +++ b/Qt_widget/include/CGAL/IO/Qt_widget_Nef_2.h @@ -87,32 +87,17 @@ template CGAL::Qt_widget& operator<<(CGAL::Qt_widget& ws, const Nef_polyhedron_2& P) { typedef Nef_polyhedron_2 Polyhedron; - typedef typename T::RT RT; typedef typename T::Standard_RT Standard_RT; typedef typename T::Standard_segment_2 Standard_segment_2; - typedef typename T::Standard_line_2 - Standard_line_2; typedef typename T::Standard_point_2 Standard_point_2; typedef typename Polyhedron::Explorer TExplorer; typedef typename TExplorer::Halfedge_around_face_const_circulator Halfedge_around_face_const_circulator; - typedef typename TExplorer::Hole_const_iterator - Hole_const_iterator; - typedef typename TExplorer::Isolated_vertex_const_iterator - Isolated_vertex_const_iterator; - typedef typename TExplorer::Ray Ray; typedef typename TExplorer::Point Point; - typedef typename TExplorer::Vertex_const_handle - Vertex_const_handle; - typedef typename TExplorer::Halfedge_const_handle - Halfedge_const_handle; - typedef typename TExplorer::Face_const_handle - Face_const_handle; - typedef typename TExplorer::Vertex_const_iterator Vertex_const_iterator; typedef typename TExplorer::Halfedge_const_iterator @@ -198,6 +183,8 @@ CGAL::Qt_widget& operator<<(CGAL::Qt_widget& ws, const Nef_polyhedron_2& P) ws.get_painter().drawPolygon(array); ws.setRasterOp(old_raster); /* + typedef typename TExplorer::Isolated_vertex_const_iterator + Isolated_vertex_const_iterator; Isolated_vertex_const_iterator iv_it; for (iv_it = D.isolated_vertices_begin(fit); iv_it != D.isolated_vertices_end(fit); ++iv_it) { diff --git a/Qt_widget/src/CGALQt3/CMakeLists.txt b/Qt_widget/src/CGALQt3/CMakeLists.txt index 7d9f3f45627..0ced524340b 100644 --- a/Qt_widget/src/CGALQt3/CMakeLists.txt +++ b/Qt_widget/src/CGALQt3/CMakeLists.txt @@ -39,7 +39,7 @@ if( QT3_FOUND ) use_essential_libs() - include_directories( ${CGAL_3RD_PARTY_INCLUDE_DIRS} ${CGAL_Qt3_3RD_PARTY_INCLUDE_DIRS} ) + include_directories( SYSTEM ${CGAL_3RD_PARTY_INCLUDE_DIRS} ${CGAL_Qt3_3RD_PARTY_INCLUDE_DIRS} ) link_directories ( ${CGAL_LIBRARIES_DIR} ${CGAL_3RD_PARTY_LIBRARIES_DIRS} ) diff --git a/Ridges_3/include/CGAL/PolyhedralSurf_neighbors.h b/Ridges_3/include/CGAL/PolyhedralSurf_neighbors.h index 7b2794b5d58..48ae880e350 100644 --- a/Ridges_3/include/CGAL/PolyhedralSurf_neighbors.h +++ b/Ridges_3/include/CGAL/PolyhedralSurf_neighbors.h @@ -149,7 +149,6 @@ compute_one_ring(const Vertex_const_handle v, std::list &contour, FT &OneRingSize) { - typedef typename std::list::const_iterator list_it; vertex_neigh.push_back(v); Halfedge_around_vertex_const_circulator he_circ = v->vertex_begin(), he_end = he_circ; diff --git a/Scripts/developer_scripts/detect_files_with_mixed_eol_styles b/Scripts/developer_scripts/detect_files_with_mixed_eol_styles new file mode 100755 index 00000000000..ecd515b1998 --- /dev/null +++ b/Scripts/developer_scripts/detect_files_with_mixed_eol_styles @@ -0,0 +1,3 @@ +#/bin/bash + +grep -lE '[^'`printf '\r'`']$' $(ack -l "`printf '\r'`\$" ${@:-.}) diff --git a/Scripts/developer_scripts/list_package_files.rb b/Scripts/developer_scripts/list_package_files.rb index 349a3dcc602..4cb763bd86f 100644 --- a/Scripts/developer_scripts/list_package_files.rb +++ b/Scripts/developer_scripts/list_package_files.rb @@ -53,10 +53,3 @@ if ARGV.length > 0 else RDoc::usage end - - - - - - - \ No newline at end of file diff --git a/Scripts/developer_scripts/mirror_all_packages.rb b/Scripts/developer_scripts/mirror_all_packages.rb index ed72293ac98..a3e4af719a1 100644 --- a/Scripts/developer_scripts/mirror_all_packages.rb +++ b/Scripts/developer_scripts/mirror_all_packages.rb @@ -117,5 +117,3 @@ unless src_package_root.empty? || tgt_build_root.empty? then else RDoc::usage end - - \ No newline at end of file diff --git a/Scripts/developer_scripts/mirror_package.rb b/Scripts/developer_scripts/mirror_package.rb index 2c75972d6b6..dcbce30f95d 100644 --- a/Scripts/developer_scripts/mirror_package.rb +++ b/Scripts/developer_scripts/mirror_package.rb @@ -101,5 +101,3 @@ unless src_package_subdir.empty? || tgt_build_root.empty? then else RDoc::usage end - - \ No newline at end of file diff --git a/Scripts/developer_scripts/mirror_package_files.rb b/Scripts/developer_scripts/mirror_package_files.rb index 338990cba0e..89fe65ef3c3 100644 --- a/Scripts/developer_scripts/mirror_package_files.rb +++ b/Scripts/developer_scripts/mirror_package_files.rb @@ -97,5 +97,3 @@ unless src_package_dir.empty? || tgt_build_dir.empty? then else RDoc::usage end - - \ No newline at end of file diff --git a/Scripts/developer_scripts/remove_package_files_from_build_tree.rb b/Scripts/developer_scripts/remove_package_files_from_build_tree.rb index 794be51b10e..14276cf9ab9 100644 --- a/Scripts/developer_scripts/remove_package_files_from_build_tree.rb +++ b/Scripts/developer_scripts/remove_package_files_from_build_tree.rb @@ -68,5 +68,3 @@ unless src_package_subdir.empty? || tgt_build_root.empty? then else RDoc::usage end - - \ No newline at end of file diff --git a/SearchStructures/examples/RangeSegmentTrees/segment_tree_1.cpp b/SearchStructures/examples/RangeSegmentTrees/segment_tree_1.cpp index ae18f536401..42e10abd101 100644 --- a/SearchStructures/examples/RangeSegmentTrees/segment_tree_1.cpp +++ b/SearchStructures/examples/RangeSegmentTrees/segment_tree_1.cpp @@ -14,7 +14,6 @@ typedef CGAL::Segment_tree_1 SSegment_tree_1_type; int main() { typedef CGAL::Tree_traits_1::Interval Interval; - typedef CGAL::Tree_traits_1::Key Key; // definition of the one-dimensional segment tree std::list InputList, OutputList, N; diff --git a/Skin_surface_3/include/CGAL/Skin_surface_base_3.h b/Skin_surface_3/include/CGAL/Skin_surface_base_3.h index c554c55b38d..4f821ed01da 100644 --- a/Skin_surface_3/include/CGAL/Skin_surface_base_3.h +++ b/Skin_surface_3/include/CGAL/Skin_surface_base_3.h @@ -498,7 +498,6 @@ construct_bounding_box() { typedef typename Regular::Finite_vertices_iterator Finite_vertices_iterator; typedef typename Regular::Geom_traits GT; - typedef typename GT::Bare_point Point; typedef typename GT::Point Weighted_point; typedef typename GT::FT FT; diff --git a/Snap_rounding_2/include/CGAL/Snap_rounding_2.h b/Snap_rounding_2/include/CGAL/Snap_rounding_2.h index 8498827d63b..05edac9231a 100644 --- a/Snap_rounding_2/include/CGAL/Snap_rounding_2.h +++ b/Snap_rounding_2/include/CGAL/Snap_rounding_2.h @@ -527,7 +527,6 @@ find_hot_pixels_and_create_kd_trees(NT pixel_size, typedef std::pair Point_hot_pixel_pair; typedef typename std::list::iterator Segment_data_iter; typedef std::list Segment_list; - typedef typename Segment_list::iterator Segment_iter; typedef typename std::list::const_iterator Point_const_iter; typedef typename Traits::Construct_segment_2 Construct_segment_2; diff --git a/Straight_skeleton_2/include/CGAL/Straight_skeleton_builder_2.h b/Straight_skeleton_2/include/CGAL/Straight_skeleton_builder_2.h index 38babbe0597..814c5b8ca20 100644 --- a/Straight_skeleton_2/include/CGAL/Straight_skeleton_builder_2.h +++ b/Straight_skeleton_2/include/CGAL/Straight_skeleton_builder_2.h @@ -889,7 +889,6 @@ public: typedef typename std::iterator_traits::value_type Input_point; typedef std::vector Input_point_vector ; - typedef typename Input_point_vector::iterator Input_point_iterator ; // Remove coincident consecutive vertices Input_point_vector lList; diff --git a/Straight_skeleton_2/include/CGAL/constructions/Straight_skeleton_cons_ftC2.h b/Straight_skeleton_2/include/CGAL/constructions/Straight_skeleton_cons_ftC2.h index e407243f46d..876971d5a6e 100644 --- a/Straight_skeleton_2/include/CGAL/constructions/Straight_skeleton_cons_ftC2.h +++ b/Straight_skeleton_2/include/CGAL/constructions/Straight_skeleton_cons_ftC2.h @@ -553,7 +553,6 @@ optional< Point_2 > construct_normal_offset_lines_isecC2 ( intrusive_ptr< Tri { typedef typename K::FT FT ; - typedef Point_2 Point_2 ; typedef Line_2 Line_2 ; typedef optional Optional_line_2 ; diff --git a/Straight_skeleton_2/include/CGAL/create_offset_polygons_2.h b/Straight_skeleton_2/include/CGAL/create_offset_polygons_2.h index 1c2dcf4fbb4..ef631e6659e 100644 --- a/Straight_skeleton_2/include/CGAL/create_offset_polygons_2.h +++ b/Straight_skeleton_2/include/CGAL/create_offset_polygons_2.h @@ -47,7 +47,6 @@ create_partial_interior_straight_skeleton_2 ( FT const& aMaxTime ) { typedef Straight_skeleton_2 Ss ; - typedef boost::shared_ptr SsPtr ; typedef Straight_skeleton_builder_traits_2 SsBuilderTraits; diff --git a/Straight_skeleton_2/include/CGAL/create_straight_skeleton_2.h b/Straight_skeleton_2/include/CGAL/create_straight_skeleton_2.h index ded63d4ab9f..a85e80de40a 100644 --- a/Straight_skeleton_2/include/CGAL/create_straight_skeleton_2.h +++ b/Straight_skeleton_2/include/CGAL/create_straight_skeleton_2.h @@ -62,7 +62,6 @@ create_interior_straight_skeleton_2 ( PointIterator aOuterContour_VerticesBegin ) { typedef Straight_skeleton_2 Ss ; - typedef boost::shared_ptr SsPtr ; typedef Straight_skeleton_builder_traits_2 SsBuilderTraits; diff --git a/Straight_skeleton_2/include/CGAL/predicates/Straight_skeleton_pred_ftC2.h b/Straight_skeleton_2/include/CGAL/predicates/Straight_skeleton_pred_ftC2.h index 3c03d45d62e..8acf94505f3 100644 --- a/Straight_skeleton_2/include/CGAL/predicates/Straight_skeleton_pred_ftC2.h +++ b/Straight_skeleton_2/include/CGAL/predicates/Straight_skeleton_pred_ftC2.h @@ -235,9 +235,7 @@ Uncertain compare_offset_lines_isec_timesC2 ( intrusive_ptr< ) { typedef typename K::FT FT ; - - typedef Trisegment_2 Trisegment_2 ; - + typedef Rational Rational ; typedef Quotient Quotient ; typedef optional Optional_rational ; @@ -361,7 +359,6 @@ oriented_side_of_event_point_wrt_bisectorC2 ( intrusive_ptr< Trisegment_2 > c typedef Point_2 Point_2 ; typedef Line_2 Line_2 ; - typedef Trisegment_2 Trisegment_2 ; Uncertain rResult = Uncertain::indeterminate(); @@ -480,9 +477,6 @@ Uncertain are_events_simultaneousC2 ( intrusive_ptr< Trisegment_2 > con typedef typename K::FT FT ; typedef Point_2 Point_2 ; - typedef Line_2 Line_2 ; - - typedef Trisegment_2 Trisegment_2 ; typedef Rational Rational ; typedef Quotient Quotient ; diff --git a/Subdivision_method_3/include/CGAL/Subdivision_method_impl_3.h b/Subdivision_method_3/include/CGAL/Subdivision_method_impl_3.h index 09681dd14c8..293ba823e6f 100644 --- a/Subdivision_method_3/include/CGAL/Subdivision_method_impl_3.h +++ b/Subdivision_method_3/include/CGAL/Subdivision_method_impl_3.h @@ -42,11 +42,6 @@ namespace Subdivision_method_3 { void PQQ_1step(Poly& p, Mask mask) { typedef Polyhedron_decorator_3 PD; - typedef typename Poly::Halfedge_data_structure HDS; - typedef typename Poly::Vertex Vertex; - typedef typename Poly::Halfedge Halfedge; - typedef typename Poly::Facet Facet; - typedef typename Poly::Vertex_handle Vertex_handle; typedef typename Poly::Halfedge_handle Halfedge_handle; typedef typename Poly::Facet_handle Facet_handle; @@ -168,8 +163,6 @@ namespace Subdivision_method_3 { typedef Polyhedron_decorator_3 PD; - typedef typename Poly::Halfedge_data_structure HDS; - typedef typename Poly::Vertex Vertex; typedef typename Poly::Halfedge Halfedge; typedef typename Poly::Facet Facet; @@ -278,8 +271,6 @@ namespace Subdivision_method_3 { typedef Polyhedron_decorator_3 PD; - typedef typename Poly::Halfedge_data_structure HDS; - typedef typename Poly::Vertex Vertex; typedef typename Poly::Halfedge Halfedge; typedef typename Poly::Facet Facet; @@ -288,7 +279,6 @@ namespace Subdivision_method_3 { typedef typename Poly::Facet_handle Facet_handle; typedef typename Poly::Vertex_iterator Vertex_iterator; - typedef typename Poly::Halfedge_iterator Halfedge_iterator; typedef typename Poly::Edge_iterator Edge_iterator; typedef typename Poly::Facet_iterator Facet_iterator; @@ -487,27 +477,16 @@ namespace Subdivision_method_3 { template class Mask> void Sqrt3_1step(Poly& p, Mask mask) { - typedef Polyhedron_decorator_3 PD; - - typedef typename Poly::Halfedge_data_structure HDS; typedef typename Poly::Vertex Vertex; typedef typename Poly::Halfedge Halfedge; typedef typename Poly::Facet Facet; - typedef typename Poly::Vertex_handle Vertex_handle; typedef typename Poly::Halfedge_handle Halfedge_handle; - typedef typename Poly::Facet_handle Facet_handle; typedef typename Poly::Vertex_iterator Vertex_iterator; - typedef typename Poly::Halfedge_iterator Halfedge_iterator; typedef typename Poly::Edge_iterator Edge_iterator; typedef typename Poly::Facet_iterator Facet_iterator; - typedef typename Poly::Halfedge_around_facet_circulator - Halfedge_around_facet_circulator; - typedef typename Poly::Halfedge_around_vertex_circulator - Halfedge_around_vertex_circulator; - typedef typename Poly::Traits Traits; typedef typename Traits::Kernel Kernel; typedef typename Kernel::Point_3 Point; diff --git a/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt b/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt index aba2919721d..02f17da8a01 100644 --- a/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt +++ b/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt @@ -4,13 +4,13 @@ project( Surface_mesh_parameterization_example ) cmake_minimum_required(VERSION 2.6.2) -if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6) - if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER 2.8.3) - cmake_policy(VERSION 2.8.4) - else() - cmake_policy(VERSION 2.6) - endif() -endif() +if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6) + if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER 2.8.3) + cmake_policy(VERSION 2.8.4) + else() + cmake_policy(VERSION 2.6) + endif() +endif() # Require packages new or improved since CGAL 3.4 include_directories (BEFORE ../../../Installation/include/) diff --git a/Surface_mesher/include/CGAL/Surface_mesher/Surface_mesher_edges_level.h b/Surface_mesher/include/CGAL/Surface_mesher/Surface_mesher_edges_level.h index bc171ec9f72..bd3e18822e4 100644 --- a/Surface_mesher/include/CGAL/Surface_mesher/Surface_mesher_edges_level.h +++ b/Surface_mesher/include/CGAL/Surface_mesher/Surface_mesher_edges_level.h @@ -95,12 +95,8 @@ namespace Surface_mesher { typedef typename Tr::Cell_handle Cell_handle; typedef typename GT::Point_3 Point_3; typedef typename GT::Triangle_3 Triangle_3; - typedef typename GT::Sphere_3 Sphere_3; - typedef typename GT::Ray_3 Ray_3; - typedef typename GT::Line_3 Line_3; typedef typename GT::Vector_3 Vector_3; typedef typename GT::FT FT; - typedef typename Surface_mesh_traits::Surface_3 Surface_3; typedef typename Surface_mesh_traits::Intersection_point Intersection_point; typename GT::Construct_midpoint_3 midpoint = diff --git a/Surface_reconstruction_points_3/doc_tex/Surface_reconstruction_points_3/contouring.tex b/Surface_reconstruction_points_3/doc_tex/Surface_reconstruction_points_3/contouring.tex index 6a5e4bd2c56..7fde5920642 100644 --- a/Surface_reconstruction_points_3/doc_tex/Surface_reconstruction_points_3/contouring.tex +++ b/Surface_reconstruction_points_3/doc_tex/Surface_reconstruction_points_3/contouring.tex @@ -6,4 +6,4 @@ The computed implicit functions can be iso-contoured to reconstruct a surface by The parameter \ccc{Tag} affects the behavior of \ccc{make_surface_mesh()}: \\ - \ccc{Manifold_tag}: the output mesh is guaranteed to be a manifold surface without boundary.\\ - \ccc{Manifold_with_boundary_tag}: the output mesh is guaranteed to be manifold and may have boundaries.\\ -- \ccc{Non_manifold_tag}: the output mesh has no guarantee and hence is outputted as a polygon soup. \ No newline at end of file +- \ccc{Non_manifold_tag}: the output mesh has no guarantee and hence is outputted as a polygon soup. diff --git a/Surface_reconstruction_points_3/doc_tex/Surface_reconstruction_points_3/output.tex b/Surface_reconstruction_points_3/doc_tex/Surface_reconstruction_points_3/output.tex index 9b4d08b8bc4..6fb926a1021 100644 --- a/Surface_reconstruction_points_3/doc_tex/Surface_reconstruction_points_3/output.tex +++ b/Surface_reconstruction_points_3/doc_tex/Surface_reconstruction_points_3/output.tex @@ -8,4 +8,4 @@ Other \cgal\ components provide functions to write the reconstructed surface mes \ccc{CGAL::output_surface_facets_to_off} \\ \ccc{CGAL::output_surface_facets_to_polyhedron} \\ -See \ccc{poisson_reconstruction_example.cpp} example above. \ No newline at end of file +See \ccc{poisson_reconstruction_example.cpp} example above. diff --git a/Surface_reconstruction_points_3/examples/Surface_reconstruction_points_3/include/compute_normal.h b/Surface_reconstruction_points_3/examples/Surface_reconstruction_points_3/include/compute_normal.h index 3437332ab75..ad8c190a3d0 100644 --- a/Surface_reconstruction_points_3/examples/Surface_reconstruction_points_3/include/compute_normal.h +++ b/Surface_reconstruction_points_3/examples/Surface_reconstruction_points_3/include/compute_normal.h @@ -24,7 +24,6 @@ typename Kernel::Vector_3 compute_facet_normal(const Facet& f) template typename Kernel::Vector_3 compute_vertex_normal(const Vertex& v) { - typedef typename Kernel::Point_3 Point; typedef typename Kernel::Vector_3 Vector; typedef typename Vertex::Halfedge_around_vertex_const_circulator HV_circulator; typedef typename Vertex::Facet Facet; diff --git a/Surface_reconstruction_points_3/include/CGAL/Poisson_mesh_cell_criteria_3.h b/Surface_reconstruction_points_3/include/CGAL/Poisson_mesh_cell_criteria_3.h index 35e5858a3f7..ddc49789022 100644 --- a/Surface_reconstruction_points_3/include/CGAL/Poisson_mesh_cell_criteria_3.h +++ b/Surface_reconstruction_points_3/include/CGAL/Poisson_mesh_cell_criteria_3.h @@ -113,7 +113,6 @@ public: typedef typename Tr::Geom_traits Geom_traits; typedef typename Geom_traits::Compute_squared_radius_3 Radius; typedef typename Geom_traits::Compute_squared_distance_3 Distance; - typedef typename Geom_traits::FT FT; Radius radius = Geom_traits().compute_squared_radius_3_object(); Distance distance = Geom_traits().compute_squared_distance_3_object(); diff --git a/Surface_reconstruction_points_3/include/CGAL/poisson_refine_triangulation.h b/Surface_reconstruction_points_3/include/CGAL/poisson_refine_triangulation.h index 6a976622167..2fd71a065b9 100644 --- a/Surface_reconstruction_points_3/include/CGAL/poisson_refine_triangulation.h +++ b/Surface_reconstruction_points_3/include/CGAL/poisson_refine_triangulation.h @@ -206,11 +206,6 @@ unsigned int poisson_refine_triangulation( // Convergence is guaranteed if radius_edge_ratio_bound >= 1.0 CGAL_surface_reconstruction_points_precondition(radius_edge_ratio_bound >= 1.0); - // Basic geometric types - typedef typename Tr::Geom_traits Gt; - typedef typename Gt::FT FT; - typedef typename Gt::Point_3 Point; - // Mesher_level types typedef Poisson_mesh_cell_criteria_3 Tets_criteria; typedef typename CGAL::Surface_mesh_traits_generator_3::type Oracle; diff --git a/Triangulation_2/include/CGAL/apply_to_range.h b/Triangulation_2/include/CGAL/apply_to_range.h index be64da04047..94abba08c71 100644 --- a/Triangulation_2/include/CGAL/apply_to_range.h +++ b/Triangulation_2/include/CGAL/apply_to_range.h @@ -35,8 +35,6 @@ void apply_to_range(const Tr &t, { if (t.dimension()<2) return; typedef typename Tr::Point POINT; - typedef typename Tr::Segment SEGMENT; - typedef typename Tr::Triangle TRIANGLE; typedef typename Tr::Face_handle hFACE; typedef typename Tr::Vertex_handle hVERTEX; typedef typename Tr::Line_face_circulator LFC; diff --git a/Triangulation_3/demo/Triangulation_3/Viewer.cpp b/Triangulation_3/demo/Triangulation_3/Viewer.cpp index 108ad36a192..9ad81eb4df7 100644 --- a/Triangulation_3/demo/Triangulation_3/Viewer.cpp +++ b/Triangulation_3/demo/Triangulation_3/Viewer.cpp @@ -30,7 +30,7 @@ void Viewer::init() // Set Smooth Shading ::glShadeModel(GL_SMOOTH); - // depth buffer setup + // depth buffer setup ::glClearDepth(1.0f); ::glEnable(GL_DEPTH_TEST); ::glDepthFunc(GL_LEQUAL); diff --git a/Triangulation_3/demo/Triangulation_3/Viewer.h b/Triangulation_3/demo/Triangulation_3/Viewer.h index 0885602c7fd..1d6e86c3a63 100644 --- a/Triangulation_3/demo/Triangulation_3/Viewer.h +++ b/Triangulation_3/demo/Triangulation_3/Viewer.h @@ -151,9 +151,9 @@ public slots : // show options inline void toggleShowAxis(bool flag) { m_showAxis = flag; updateGL(); } - inline void toggleShowVertex(bool flag) { m_showVertex = flag; updateGL(); } - inline void toggleShowDEdge(bool flag) { m_showDEdge = flag; updateGL(); } - inline void toggleShowVEdge(bool flag) { m_showVEdge = flag; updateGL(); } + inline void toggleShowVertex(bool flag) { m_showVertex = flag; updateGL(); } + inline void toggleShowDEdge(bool flag) { m_showDEdge = flag; updateGL(); } + inline void toggleShowVEdge(bool flag) { m_showVEdge = flag; updateGL(); } inline void toggleShowFacet(bool flag) { m_showFacet = flag; updateGL(); } inline void toggleFlat(bool flag) { m_isFlat = flag; updateGL(); } diff --git a/Width_3/include/CGAL/Width_3.h b/Width_3/include/CGAL/Width_3.h index 4d1b295f717..e24cbec0e90 100644 --- a/Width_3/include/CGAL/Width_3.h +++ b/Width_3/include/CGAL/Width_3.h @@ -1385,18 +1385,10 @@ class Width_3 { void width_3_convex(InputPolyhedron &P) { DEBUGMSG(WIDTH_3_CONVEX,"\nBegin WIDTH_3_CONVEX"); typedef CGAL::Width_3_internal::Data_access DA; - typedef typename DA::Polyhedron Polyhedron; - typedef typename DA::Vertex Vertex; - typedef typename DA::Facet Facet; - typedef typename DA::Halfedge Halfedge; typedef typename DA::Facet_handle Facet_handle; typedef typename DA::Vertex_handle Vertex_handle; typedef typename DA::Halfedge_handle Halfedge_handle; - typedef typename DA::PolyPoint PolyPoint; - typedef typename DA::Plane Plane; - typedef typename DA::Halfedge_iterator Halfedge_iterator; typedef typename DA::Vertex_iterator Vertex_iterator; - typedef typename DA::Facet_iterator Facet_iterator; //Ensure that Polyhedron has at least one vertex CGAL_assertion_msg(P.size_of_vertices()>2, "Can not compute width of a 0, 1 or 2-vertex polyhedron"); diff --git a/wininst/developer_scripts/script_cgal.nsi b/wininst/developer_scripts/script_cgal.nsi index d7353afdd6a..1fb4862f7f9 100644 --- a/wininst/developer_scripts/script_cgal.nsi +++ b/wininst/developer_scripts/script_cgal.nsi @@ -28,7 +28,7 @@ !include "script_cgal.nsh" -!define CGAL_SRC "CGAL-4.0" +!define CGAL_SRC "CGAL-4.1" !define FTP_SRC "https://cgal.geometryfactory.com/CGAL/precompiled_libs/" ;-------------------------------- @@ -52,12 +52,12 @@ BrandingText "The CGAL Project and GeometryFactory - Installer created with NSIS." - VIProductVersion "4.0.0.0" + VIProductVersion "4.1.0.0" VIAddVersionKey "ProductName" "CGAL Windows Installer" VIAddVersionKey "CompanyName" "The CGAL Project and GeometryFactory" VIAddVersionKey "LegalCopyright" "© The CGAL Project and GeometryFactory" VIAddVersionKey "FileDescription" "Windows Installer for CGAL" - VIAddVersionKey "FileVersion" "4.0" + VIAddVersionKey "FileVersion" "4.1" ;-------------------------------- ; Variables @@ -178,7 +178,7 @@ Section "!Main CGAL" MAIN_Idx ; Write uninstall informations ; http://nsis.sourceforge.net/Add_uninstall_information_to_Add/Remove_Programs WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${CGAL_SRC}" \ - "DisplayName" "${CGAL_SRC} -- Computational Geometry Algorithms Library, version 4.0" + "DisplayName" "${CGAL_SRC} -- Computational Geometry Algorithms Library, version 4.1" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${CGAL_SRC}" \ "UninstallString" "$\"$INSTDIR\Uninstall.exe$\"" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${CGAL_SRC}" \ @@ -197,7 +197,7 @@ Section "!Main CGAL" MAIN_Idx WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${CGAL_SRC}" \ "URLInfoAbout" "http://www.cgal.org/" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${CGAL_SRC}" \ - "DisplayedVersion" "4.0.0" + "DisplayedVersion" "4.1.0" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${CGAL_SRC}" \ "CGALUninstallRegLoc" "$RegLoc" @@ -240,7 +240,7 @@ SectionEnd Section /o "HTML Manuals" DOC_Idx !ifndef FetchLocal - !insertmacro DownloadFileFrom "https://cgal.geometryfactory.com/" "CGAL/4.0/Manual/" "cgal_manual.zip" "$INSTDIR\doc_html" + !insertmacro DownloadFileFrom "https://cgal.geometryfactory.com/" "CGAL/4.1/Manual/" "cgal_manual.zip" "$INSTDIR\doc_html" !endif SectionEnd