diff --git a/.gitattributes b/.gitattributes index 98711fb84d4..b40db128d4c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1226,6 +1226,7 @@ Box_intersection_d/doc_tex/Box_intersection_d/fig/box_inters-small.gif -text svn Box_intersection_d/doc_tex/Box_intersection_d/fig/box_inters.gif -text svneol=unset#image/gif Box_intersection_d/doc_tex/Box_intersection_d/fig/box_inters.pdf -text svneol=unset#application/pdf Box_intersection_d/test/Box_intersection_d/benchmark.plot -text svneol=native#application/postscript +CGAL_ImageIO/src/CGAL_ImageIO/CMakeLists.txt -text CGAL_ipelets/TODO -text CGAL_ipelets/demo/CGAL_ipelets/CMakeLists.txt -text CGAL_ipelets/demo/CGAL_ipelets/alpha_shapes.cpp -text @@ -1277,7 +1278,6 @@ CGAL_ipelets/include/CGAL/CGAL_Ipelet_base_v6.h -text CGAL_ipelets/include/CGAL/CGAL_Ipelet_base_v7.h -text CGAL_ipelets/include/CGAL/grabbers.h -text CGAL_ipelets/package_info/CGAL_ipelets/maintainer -text -CGALimageIO/src/CGALImageIO/CMakeLists.txt -text Circular_kernel_2/benchmark/parser/Report.pdf -text svneol=unset#application/pdf Circular_kernel_2/benchmark/readme.doc -text svneol=unset#application/msword Circular_kernel_2/benchmark/readme.pdf -text svneol=unset#application/pdf @@ -1726,7 +1726,7 @@ GraphicsView/doc_tex/GraphicsView/full.png -text GraphicsView/doc_tex/GraphicsView/uml-design.graphml -text GraphicsView/doc_tex/GraphicsView/uml-design.pdf -text GraphicsView/doc_tex/GraphicsView/uml-design.png -text -GraphicsView/src/CGALQt4/GraphicsView.qtmoc.cmake -text +GraphicsView/src/CGAL_Qt4/GraphicsView.qtmoc.cmake -text HalfedgeDS/doc_tex/HalfedgeDS/fig/halfedge.gif -text svneol=unset#image/gif HalfedgeDS/doc_tex/HalfedgeDS/fig/halfedge.pdf -text svneol=unset#application/pdf HalfedgeDS/doc_tex/HalfedgeDS/fig/halfedge_small.gif -text svneol=unset#image/gif @@ -1962,8 +1962,8 @@ Kinetic_data_structures/include/CGAL/Kinetic/Inexact_simulation_traits.h -text Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_CORE_exact_simulation_traits.h -text Kinetic_data_structures/include/CGAL/Kinetic/listeners.h -text Kinetic_data_structures/include/CGAL/Tools/utility_macros.h -text -Kinetic_data_structures/src/CGALQt3/Kinetic_data_structures.qtmoc.cmake -text -Kinetic_data_structures/src/CGALQt3/Kinetic_print.xpm -text +Kinetic_data_structures/src/CGAL_Qt3/Kinetic_data_structures.qtmoc.cmake -text +Kinetic_data_structures/src/CGAL_Qt3/Kinetic_print.xpm -text Kinetic_data_structures/test/Kinetic_data_structures/data/points_3.n=10,d=1,n -text Kinetic_data_structures/test/Kinetic_data_structures/data/points_3.n=10,d=3 -text Kinetic_data_structures/test/Kinetic_data_structures/data/points_3.n=10,d=3,n -text @@ -2200,8 +2200,8 @@ 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.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-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-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 @@ -2242,7 +2242,6 @@ Maintenance/release_building/BUGFIX_NUMBER -text Maintenance/release_building/MAJOR_NUMBER -text Maintenance/release_building/MINOR_NUMBER -text Maintenance/release_building/global_dont_submit -text -Maintenance/release_building/public_release_name -text Maintenance/svn_server/hooks/Mail/Sender.pm -text Maintenance/svn_server/hooks/Mail/Sender/CType/Ext.pm -text Maintenance/svn_server/hooks/check-capabilities.pl -text @@ -2991,7 +2990,7 @@ Nef_S2/doc_tex/Nef_S2_ref/fig/shalfedge.pdf -text svneol=unset#application/pdf Nef_S2/doc_tex/Nef_S2_ref/fig/shalfloopB.gif -text svneol=unset#image/gif Nef_S2/doc_tex/Nef_S2_ref/fig/shalfloopB.pdf -text svneol=unset#application/pdf Nef_S2/include/CGAL/IO/Nef_polyhedron_iostream_S2.h -text -Nef_S2/src/CGALQt3/Nef_S2.qtmoc.cmake -text +Nef_S2/src/CGAL_Qt3/Nef_S2.qtmoc.cmake -text Number_types/doc_tex/NumberTypeSupport/illustration.png -text Number_types/doc_tex/NumberTypeSupport_ref/CORE_BigFloat.tex -text Number_types/doc_tex/NumberTypeSupport_ref/Gmpfi.tex -text @@ -3537,8 +3536,8 @@ Qt_widget/doc_tex/Qt_widget/standard_toolbar.pdf -text svneol=unset#application/ Qt_widget/doc_tex/Qt_widget/standard_toolbar.png -text svneol=unset#image/png Qt_widget/doc_tex/Qt_widget/triangulation.gif -text svneol=unset#image/gif Qt_widget/doc_tex/Qt_widget/triangulation.pdf -text svneol=unset#application/pdf -Qt_widget/src/CGALQt3/CMakeLists.txt -text -Qt_widget/src/CGALQt3/Qt_widget.qtmoc.cmake -text +Qt_widget/src/CGAL_Qt3/CMakeLists.txt -text +Qt_widget/src/CGAL_Qt3/Qt_widget.qtmoc.cmake -text Ridges_3/doc_tex/Ridges_3/RidgesMechPartDetail.png -text Ridges_3/doc_tex/Ridges_3/david_crest.jpg -text Ridges_3/doc_tex/Ridges_3/david_crest_small.png -text svneol=unset#image/png @@ -3585,6 +3584,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 @@ -3999,6 +3999,8 @@ Stream_lines_2/doc_tex/Stream_lines_2/streamlines-small.jpg -text svneol=unset#i Stream_lines_2/doc_tex/Stream_lines_2/streamlines-teaser.jpg -text svneol=unset#image/jpeg Stream_lines_2/test/Stream_lines_2/data/datap.tri.cin -text Stream_lines_2/test/Stream_lines_2/data/datav.tri.cin -text +Stream_support/doc_tex/IOstream/io.png -text +Stream_support/test/Stream_support/data/io.cin -text Subdivision_method_3/doc_tex/Subdivision_method_3/FIG/CCSubdivision.png -text svneol=unset#image/png Subdivision_method_3/doc_tex/Subdivision_method_3/FIG/PQQStencil.fig -text svneol=unset#application/octet-stream Subdivision_method_3/doc_tex/Subdivision_method_3/FIG/PQQStencil.gif -text svneol=unset#image/gif @@ -4551,8 +4553,6 @@ Triangulation_3/test/Triangulation_3/include/CGAL/_test_remove_cluster.h -text Triangulation_3/test/Triangulation_3/test_regular_insert_range_with_info.cpp -text Triangulation_3/test/Triangulation_3/test_static_filters.cpp -text Voronoi_diagram_2/doc_tex/Voronoi_diagram_2/voronoi.png -text -iostream/doc_tex/IOstream/io.png -text -iostream/test/iostream/data/io.cin -text wininst/developer_scripts/CGAL.bmp -text svneol=unset#image/bmp wininst/developer_scripts/DumpLogToFile.nsh -text wininst/developer_scripts/EnvVarUpdate.nsh -text diff --git a/.gitignore b/.gitignore index 56eae683938..70fcfbaf68c 100644 --- a/.gitignore +++ b/.gitignore @@ -29,6 +29,8 @@ AABB_tree/test/AABB_tree/aabb_naive_vs_tree_distance_segment_test AABB_tree/test/AABB_tree/aabb_projection_triangle_test AABB_tree/test/AABB_tree/aabb_projection_triangle_test.vcproj AABB_tree/test/AABB_tree/cgal_test_with_cmake +Algebraic_kernel_d/test/Algebraic_kernel_d/cgal_test_with_cmake +Algebraic_kernel_d/test/Algebraic_kernel_d/rs_isolator Alpha_shapes_2/demo/Alpha_shapes_2/*.exe Alpha_shapes_2/demo/Alpha_shapes_2/*.vcproj Alpha_shapes_2/demo/Alpha_shapes_2/Makefile @@ -53,6 +55,11 @@ Apollonius_graph_2/demo/Apollonius_graph_2/*.exe Apollonius_graph_2/demo/Apollonius_graph_2/*.vcproj Apollonius_graph_2/demo/Apollonius_graph_2/Makefile Apollonius_graph_2/demo/Apollonius_graph_2/apollonius_graph_2 +Arithmetic_kernel/test/Arithmetic_kernel/Arithmetic_kernel +Arithmetic_kernel/test/Arithmetic_kernel/CORE_arithmetic_kernel +Arithmetic_kernel/test/Arithmetic_kernel/GMP_arithmetic_kernel +Arithmetic_kernel/test/Arithmetic_kernel/Get_arithmetic_kernel +Arithmetic_kernel/test/Arithmetic_kernel/LEDA_arithmetic_kernel Arrangement_on_surface_2/examples/Arrangement_on_surface_2/Bezier_curves Arrangement_on_surface_2/examples/Arrangement_on_surface_2/CMakeLists.txt Arrangement_on_surface_2/examples/Arrangement_on_surface_2/dual_lines @@ -69,22 +76,22 @@ Boolean_set_operations_2/demo/Boolean_set_operations_2/*.sln Boolean_set_operations_2/demo/Boolean_set_operations_2/*.vcproj Boolean_set_operations_2/demo/Boolean_set_operations_2/Makefile Boolean_set_operations_2/demo/Boolean_set_operations_2/boolean_operations_2 -CGALimageIO/demo/CGALimageIO/Makefile -CGALimageIO/demo/CGALimageIO/cgal_test_with_cmake -CGALimageIO/demo/CGALimageIO/cmake_install.cmake -CGALimageIO/demo/CGALimageIO/image_to_vtk_viewer -CGALimageIO/examples/CGALimageIO/*.exe -CGALimageIO/examples/CGALimageIO/Makefile -CGALimageIO/examples/CGALimageIO/cgal_test_with_cmake -CGALimageIO/examples/CGALimageIO/convert_raw_image_to_inr -CGALimageIO/examples/CGALimageIO/makefile -CGALimageIO/examples/CGALimageIO/test_imageio -CGALimageIO/src/CGALImageIO/Makefile -CGALimageIO/test/CGALimageIO/*.exe -CGALimageIO/test/CGALimageIO/*.sln -CGALimageIO/test/CGALimageIO/*.vcproj -CGALimageIO/test/CGALimageIO/Makefile -CGALimageIO/test/CGALimageIO/test_trilinear_interpolation +CGAL_ImageIO/demo/CGALimageIO/Makefile +CGAL_ImageIO/demo/CGALimageIO/cgal_test_with_cmake +CGAL_ImageIO/demo/CGALimageIO/cmake_install.cmake +CGAL_ImageIO/demo/CGALimageIO/image_to_vtk_viewer +CGAL_ImageIO/examples/CGALimageIO/*.exe +CGAL_ImageIO/examples/CGALimageIO/Makefile +CGAL_ImageIO/examples/CGALimageIO/cgal_test_with_cmake +CGAL_ImageIO/examples/CGALimageIO/convert_raw_image_to_inr +CGAL_ImageIO/examples/CGALimageIO/makefile +CGAL_ImageIO/examples/CGALimageIO/test_imageio +CGAL_ImageIO/src/CGAL_ImageIO/Makefile +CGAL_ImageIO/test/CGAL_ImageIO/*.exe +CGAL_ImageIO/test/CGAL_ImageIO/*.sln +CGAL_ImageIO/test/CGAL_ImageIO/*.vcproj +CGAL_ImageIO/test/CGAL_ImageIO/Makefile +CGAL_ImageIO/test/CGAL_ImageIO/test_trilinear_interpolation Circular_kernel_3/demo/Circular_kernel_3/*.exe Circular_kernel_3/demo/Circular_kernel_3/*.sln Circular_kernel_3/demo/Circular_kernel_3/*.vcproj @@ -152,12 +159,16 @@ GraphicsView/doc_tex/GraphicsView.tex GraphicsView/doc_tex/GraphicsView/auto GraphicsView/doc_tex/GraphicsView_ref/auto GraphicsView/doc_tex/auto -GraphicsView/src/CGALQt4/*.dll -GraphicsView/src/CGALQt4/*.lib -GraphicsView/src/CGALQt4/*.so -GraphicsView/src/CGALQt4/Makefile -GraphicsView/src/CGALQt4/moc_*.cxx -GraphicsView/src/CGALQt4/qrc_*.cxx +GraphicsView/src/CGAL_Qt4/*.dll +GraphicsView/src/CGAL_Qt4/*.lib +GraphicsView/src/CGAL_Qt4/*.so +GraphicsView/src/CGAL_Qt4/Makefile +GraphicsView/src/CGAL_Qt4/moc_*.cxx +GraphicsView/src/CGAL_Qt4/qrc_*.cxx +HalfedgeDS/test/HalfedgeDS/CMakeLists.txt +HalfedgeDS/test/HalfedgeDS/cgal_test_with_cmake +HalfedgeDS/test/HalfedgeDS/test_hds +HalfedgeDS/test/HalfedgeDS/test_hds_decorator Installation/auxiliary/gdb/python/CGAL/__init__.pyc Installation/auxiliary/gdb/python/CGAL/printers.pyc Installation/auxiliary/gdb/test @@ -165,6 +176,7 @@ Installation/cmake/modules/*.tmp Installation/test/Installation/cgal_test Installation/test/Installation/deprecation_warning Interpolation/demo/Interpolation/cgal_test_with_cmake +Intersections_2/test/Intersections_2/CMakeLists.txt Intersections_3/test/Intersections_3/CMakeLists.txt Intersections_3/test/Intersections_3/bbox_other_do_intersect_test Intersections_3/test/Intersections_3/cgal_test_with_cmake @@ -327,26 +339,26 @@ 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.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-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-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 @@ -935,6 +947,7 @@ Polyhedron/demo/Polyhedron/ui_*.h Polyhedron/test/Polyhedron/*.kdev* Polyhedron/test/Polyhedron/CMakeLists.txt Polyhedron/test/Polyhedron/Makefile +Polyhedron/test/Polyhedron/cgal_test_with_cmake Polyhedron/test/Polyhedron/test_polyhedron Polynomial/doc_html Polynomial/doc_pdf @@ -972,7 +985,7 @@ QP_solver/documentation/UpdateZ.log QP_solver/documentation/UpdateZ.pdf QP_solver/documentation/UpdateZ.synctex.gz Qt_widget/.env -Qt_widget/src/CGALQt3/*.moc +Qt_widget/src/CGAL_Qt3/*.moc Qt_widget/test/Qt_widget/test_qt_version Random_numbers/*.aux Random_numbers/*.bbl diff --git a/Alpha_shapes_2/include/CGAL/Alpha_shape_2.h b/Alpha_shapes_2/include/CGAL/Alpha_shape_2.h index f2890937d1e..85b6fb811a8 100644 --- a/Alpha_shapes_2/include/CGAL/Alpha_shape_2.h +++ b/Alpha_shapes_2/include/CGAL/Alpha_shape_2.h @@ -680,7 +680,7 @@ public: } size_type - number_solid_components(const Type_of_alpha& alpha) const + number_solid_components(const Type_of_alpha& /* alpha */) const { return number_of_solid_components(get_alpha()); } 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/Core/examples/Core/delaunay.cpp b/CGAL_Core/examples/Core/delaunay.cpp similarity index 100% rename from Core/examples/Core/delaunay.cpp rename to CGAL_Core/examples/Core/delaunay.cpp diff --git a/Core/include/CGAL/CORE/BigFloat.h b/CGAL_Core/include/CGAL/CORE/BigFloat.h similarity index 100% rename from Core/include/CGAL/CORE/BigFloat.h rename to CGAL_Core/include/CGAL/CORE/BigFloat.h diff --git a/Core/include/CGAL/CORE/BigFloatRep.h b/CGAL_Core/include/CGAL/CORE/BigFloatRep.h similarity index 100% rename from Core/include/CGAL/CORE/BigFloatRep.h rename to CGAL_Core/include/CGAL/CORE/BigFloatRep.h diff --git a/Core/include/CGAL/CORE/BigInt.h b/CGAL_Core/include/CGAL/CORE/BigInt.h similarity index 100% rename from Core/include/CGAL/CORE/BigInt.h rename to CGAL_Core/include/CGAL/CORE/BigInt.h diff --git a/Core/include/CGAL/CORE/BigRat.h b/CGAL_Core/include/CGAL/CORE/BigRat.h similarity index 100% rename from Core/include/CGAL/CORE/BigRat.h rename to CGAL_Core/include/CGAL/CORE/BigRat.h diff --git a/Core/include/CGAL/CORE/CORE.h b/CGAL_Core/include/CGAL/CORE/CORE.h similarity index 100% rename from Core/include/CGAL/CORE/CORE.h rename to CGAL_Core/include/CGAL/CORE/CORE.h diff --git a/Core/include/CGAL/CORE/Config.h b/CGAL_Core/include/CGAL/CORE/Config.h similarity index 100% rename from Core/include/CGAL/CORE/Config.h rename to CGAL_Core/include/CGAL/CORE/Config.h diff --git a/Core/include/CGAL/CORE/CoreAux.h b/CGAL_Core/include/CGAL/CORE/CoreAux.h similarity index 100% rename from Core/include/CGAL/CORE/CoreAux.h rename to CGAL_Core/include/CGAL/CORE/CoreAux.h diff --git a/Core/include/CGAL/CORE/CoreDefs.h b/CGAL_Core/include/CGAL/CORE/CoreDefs.h similarity index 100% rename from Core/include/CGAL/CORE/CoreDefs.h rename to CGAL_Core/include/CGAL/CORE/CoreDefs.h diff --git a/Core/include/CGAL/CORE/Expr.h b/CGAL_Core/include/CGAL/CORE/Expr.h similarity index 100% rename from Core/include/CGAL/CORE/Expr.h rename to CGAL_Core/include/CGAL/CORE/Expr.h diff --git a/Core/include/CGAL/CORE/ExprRep.h b/CGAL_Core/include/CGAL/CORE/ExprRep.h similarity index 100% rename from Core/include/CGAL/CORE/ExprRep.h rename to CGAL_Core/include/CGAL/CORE/ExprRep.h diff --git a/Core/include/CGAL/CORE/Filter.h b/CGAL_Core/include/CGAL/CORE/Filter.h similarity index 100% rename from Core/include/CGAL/CORE/Filter.h rename to CGAL_Core/include/CGAL/CORE/Filter.h diff --git a/Core/include/CGAL/CORE/Gmp.h b/CGAL_Core/include/CGAL/CORE/Gmp.h similarity index 100% rename from Core/include/CGAL/CORE/Gmp.h rename to CGAL_Core/include/CGAL/CORE/Gmp.h diff --git a/Core/include/CGAL/CORE/Impl.h b/CGAL_Core/include/CGAL/CORE/Impl.h similarity index 100% rename from Core/include/CGAL/CORE/Impl.h rename to CGAL_Core/include/CGAL/CORE/Impl.h diff --git a/Core/include/CGAL/CORE/MemoryPool.h b/CGAL_Core/include/CGAL/CORE/MemoryPool.h similarity index 100% rename from Core/include/CGAL/CORE/MemoryPool.h rename to CGAL_Core/include/CGAL/CORE/MemoryPool.h diff --git a/Core/include/CGAL/CORE/Promote.h b/CGAL_Core/include/CGAL/CORE/Promote.h similarity index 100% rename from Core/include/CGAL/CORE/Promote.h rename to CGAL_Core/include/CGAL/CORE/Promote.h diff --git a/Core/include/CGAL/CORE/Real.h b/CGAL_Core/include/CGAL/CORE/Real.h similarity index 100% rename from Core/include/CGAL/CORE/Real.h rename to CGAL_Core/include/CGAL/CORE/Real.h diff --git a/Core/include/CGAL/CORE/RealRep.h b/CGAL_Core/include/CGAL/CORE/RealRep.h similarity index 100% rename from Core/include/CGAL/CORE/RealRep.h rename to CGAL_Core/include/CGAL/CORE/RealRep.h diff --git a/Core/include/CGAL/CORE/RefCount.h b/CGAL_Core/include/CGAL/CORE/RefCount.h similarity index 100% rename from Core/include/CGAL/CORE/RefCount.h rename to CGAL_Core/include/CGAL/CORE/RefCount.h diff --git a/Core/include/CGAL/CORE/Timer.h b/CGAL_Core/include/CGAL/CORE/Timer.h similarity index 100% rename from Core/include/CGAL/CORE/Timer.h rename to CGAL_Core/include/CGAL/CORE/Timer.h diff --git a/Core/include/CGAL/CORE/extLong.h b/CGAL_Core/include/CGAL/CORE/extLong.h similarity index 100% rename from Core/include/CGAL/CORE/extLong.h rename to CGAL_Core/include/CGAL/CORE/extLong.h diff --git a/Core/include/CGAL/CORE/geom2d/circle2d.h b/CGAL_Core/include/CGAL/CORE/geom2d/circle2d.h similarity index 100% rename from Core/include/CGAL/CORE/geom2d/circle2d.h rename to CGAL_Core/include/CGAL/CORE/geom2d/circle2d.h diff --git a/Core/include/CGAL/CORE/geom2d/line2d.h b/CGAL_Core/include/CGAL/CORE/geom2d/line2d.h similarity index 100% rename from Core/include/CGAL/CORE/geom2d/line2d.h rename to CGAL_Core/include/CGAL/CORE/geom2d/line2d.h diff --git a/Core/include/CGAL/CORE/geom2d/point2d.h b/CGAL_Core/include/CGAL/CORE/geom2d/point2d.h similarity index 100% rename from Core/include/CGAL/CORE/geom2d/point2d.h rename to CGAL_Core/include/CGAL/CORE/geom2d/point2d.h diff --git a/Core/include/CGAL/CORE/geom2d/segment2d.h b/CGAL_Core/include/CGAL/CORE/geom2d/segment2d.h similarity index 100% rename from Core/include/CGAL/CORE/geom2d/segment2d.h rename to CGAL_Core/include/CGAL/CORE/geom2d/segment2d.h diff --git a/Core/include/CGAL/CORE/geom3d/line3d.h b/CGAL_Core/include/CGAL/CORE/geom3d/line3d.h similarity index 100% rename from Core/include/CGAL/CORE/geom3d/line3d.h rename to CGAL_Core/include/CGAL/CORE/geom3d/line3d.h diff --git a/Core/include/CGAL/CORE/geom3d/plane3d.h b/CGAL_Core/include/CGAL/CORE/geom3d/plane3d.h similarity index 100% rename from Core/include/CGAL/CORE/geom3d/plane3d.h rename to CGAL_Core/include/CGAL/CORE/geom3d/plane3d.h diff --git a/Core/include/CGAL/CORE/geom3d/point3d.h b/CGAL_Core/include/CGAL/CORE/geom3d/point3d.h similarity index 100% rename from Core/include/CGAL/CORE/geom3d/point3d.h rename to CGAL_Core/include/CGAL/CORE/geom3d/point3d.h diff --git a/Core/include/CGAL/CORE/geom3d/polygon3d.h b/CGAL_Core/include/CGAL/CORE/geom3d/polygon3d.h similarity index 100% rename from Core/include/CGAL/CORE/geom3d/polygon3d.h rename to CGAL_Core/include/CGAL/CORE/geom3d/polygon3d.h diff --git a/Core/include/CGAL/CORE/geom3d/segment3d.h b/CGAL_Core/include/CGAL/CORE/geom3d/segment3d.h similarity index 100% rename from Core/include/CGAL/CORE/geom3d/segment3d.h rename to CGAL_Core/include/CGAL/CORE/geom3d/segment3d.h diff --git a/Core/include/CGAL/CORE/geom3d/triangle3d.h b/CGAL_Core/include/CGAL/CORE/geom3d/triangle3d.h similarity index 100% rename from Core/include/CGAL/CORE/geom3d/triangle3d.h rename to CGAL_Core/include/CGAL/CORE/geom3d/triangle3d.h diff --git a/Core/include/CGAL/CORE/geombase.h b/CGAL_Core/include/CGAL/CORE/geombase.h similarity index 100% rename from Core/include/CGAL/CORE/geombase.h rename to CGAL_Core/include/CGAL/CORE/geombase.h diff --git a/Core/include/CGAL/CORE/geometry2d.h b/CGAL_Core/include/CGAL/CORE/geometry2d.h similarity index 100% rename from Core/include/CGAL/CORE/geometry2d.h rename to CGAL_Core/include/CGAL/CORE/geometry2d.h diff --git a/Core/include/CGAL/CORE/geometry3d.h b/CGAL_Core/include/CGAL/CORE/geometry3d.h similarity index 100% rename from Core/include/CGAL/CORE/geometry3d.h rename to CGAL_Core/include/CGAL/CORE/geometry3d.h diff --git a/Core/include/CGAL/CORE/linearAlgebra.h b/CGAL_Core/include/CGAL/CORE/linearAlgebra.h similarity index 100% rename from Core/include/CGAL/CORE/linearAlgebra.h rename to CGAL_Core/include/CGAL/CORE/linearAlgebra.h diff --git a/Core/include/CGAL/CORE/poly/Curves.h b/CGAL_Core/include/CGAL/CORE/poly/Curves.h similarity index 100% rename from Core/include/CGAL/CORE/poly/Curves.h rename to CGAL_Core/include/CGAL/CORE/poly/Curves.h diff --git a/Core/include/CGAL/CORE/poly/Curves.tcc b/CGAL_Core/include/CGAL/CORE/poly/Curves.tcc similarity index 100% rename from Core/include/CGAL/CORE/poly/Curves.tcc rename to CGAL_Core/include/CGAL/CORE/poly/Curves.tcc diff --git a/Core/include/CGAL/CORE/poly/Poly.h b/CGAL_Core/include/CGAL/CORE/poly/Poly.h similarity index 100% rename from Core/include/CGAL/CORE/poly/Poly.h rename to CGAL_Core/include/CGAL/CORE/poly/Poly.h diff --git a/Core/include/CGAL/CORE/poly/Poly.tcc b/CGAL_Core/include/CGAL/CORE/poly/Poly.tcc similarity index 100% rename from Core/include/CGAL/CORE/poly/Poly.tcc rename to CGAL_Core/include/CGAL/CORE/poly/Poly.tcc diff --git a/Core/include/CGAL/CORE/poly/Sturm.h b/CGAL_Core/include/CGAL/CORE/poly/Sturm.h similarity index 100% rename from Core/include/CGAL/CORE/poly/Sturm.h rename to CGAL_Core/include/CGAL/CORE/poly/Sturm.h diff --git a/Core/include/CGAL/export/CORE.h b/CGAL_Core/include/CGAL/export/CORE.h similarity index 100% rename from Core/include/CGAL/export/CORE.h rename to CGAL_Core/include/CGAL/export/CORE.h diff --git a/Core/package_info/Core/description.txt b/CGAL_Core/package_info/CGAL_Core/description.txt similarity index 100% rename from Core/package_info/Core/description.txt rename to CGAL_Core/package_info/CGAL_Core/description.txt diff --git a/Core/package_info/Core/license.txt b/CGAL_Core/package_info/CGAL_Core/license.txt similarity index 100% rename from Core/package_info/Core/license.txt rename to CGAL_Core/package_info/CGAL_Core/license.txt diff --git a/Core/package_info/Core/maintainer b/CGAL_Core/package_info/CGAL_Core/maintainer similarity index 100% rename from Core/package_info/Core/maintainer rename to CGAL_Core/package_info/CGAL_Core/maintainer diff --git a/Core/src/CGALCore/BigFloat.cpp b/CGAL_Core/src/CGAL_Core/BigFloat.cpp similarity index 100% rename from Core/src/CGALCore/BigFloat.cpp rename to CGAL_Core/src/CGAL_Core/BigFloat.cpp diff --git a/Core/src/CGALCore/CMakeLists.txt b/CGAL_Core/src/CGAL_Core/CMakeLists.txt similarity index 90% rename from Core/src/CGALCore/CMakeLists.txt rename to CGAL_Core/src/CGAL_Core/CMakeLists.txt index 8e5e50f8553..02b5103db2e 100644 --- a/Core/src/CGALCore/CMakeLists.txt +++ b/CGAL_Core/src/CGAL_Core/CMakeLists.txt @@ -8,7 +8,7 @@ add_definitions(${CGAL_3RD_PARTY_DEFINITIONS}) link_directories ( ${CGAL_LIBRARIES_DIR} ${CGAL_3RD_PARTY_LIBRARIES_DIRS} ) -collect_cgal_library(CGAL_Core CGALCore "") +collect_cgal_library(CGAL_Core "") target_link_libraries( CGAL_Core ${CGAL_LIBRARY} ${CGAL_3RD_PARTY_LIBRARIES} ) diff --git a/Core/src/CGALCore/CoreAux.cpp b/CGAL_Core/src/CGAL_Core/CoreAux.cpp similarity index 100% rename from Core/src/CGALCore/CoreAux.cpp rename to CGAL_Core/src/CGAL_Core/CoreAux.cpp diff --git a/Core/src/CGALCore/CoreDefs.cpp b/CGAL_Core/src/CGAL_Core/CoreDefs.cpp similarity index 100% rename from Core/src/CGALCore/CoreDefs.cpp rename to CGAL_Core/src/CGAL_Core/CoreDefs.cpp diff --git a/Core/src/CGALCore/CoreIO.cpp b/CGAL_Core/src/CGAL_Core/CoreIO.cpp similarity index 100% rename from Core/src/CGALCore/CoreIO.cpp rename to CGAL_Core/src/CGAL_Core/CoreIO.cpp diff --git a/Core/src/CGALCore/Expr.cpp b/CGAL_Core/src/CGAL_Core/Expr.cpp similarity index 100% rename from Core/src/CGALCore/Expr.cpp rename to CGAL_Core/src/CGAL_Core/Expr.cpp diff --git a/Core/src/CGALCore/GmpIO.cpp b/CGAL_Core/src/CGAL_Core/GmpIO.cpp similarity index 100% rename from Core/src/CGALCore/GmpIO.cpp rename to CGAL_Core/src/CGAL_Core/GmpIO.cpp diff --git a/Core/src/CGALCore/Real.cpp b/CGAL_Core/src/CGAL_Core/Real.cpp similarity index 100% rename from Core/src/CGALCore/Real.cpp rename to CGAL_Core/src/CGAL_Core/Real.cpp diff --git a/Core/src/CGALCore/extLong.cpp b/CGAL_Core/src/CGAL_Core/extLong.cpp similarity index 100% rename from Core/src/CGALCore/extLong.cpp rename to CGAL_Core/src/CGAL_Core/extLong.cpp diff --git a/CGALimageIO/demo/CGALimageIO/CMakeLists.txt b/CGAL_ImageIO/demo/CGALimageIO/CMakeLists.txt similarity index 94% rename from CGALimageIO/demo/CGALimageIO/CMakeLists.txt rename to CGAL_ImageIO/demo/CGALimageIO/CMakeLists.txt index 2ed7be1f3bd..ba20e7ed080 100644 --- a/CGALimageIO/demo/CGALimageIO/CMakeLists.txt +++ b/CGAL_ImageIO/demo/CGALimageIO/CMakeLists.txt @@ -15,12 +15,12 @@ set(PACKAGE_ROOT ../..) # Add several CGAL packages to the include and link paths, # if they lie in ${PACKAGE_ROOT}/. foreach(INC_DIR ${PACKAGE_ROOT}/include - ${PACKAGE_ROOT}/../CGALimageIO/include ) + ${PACKAGE_ROOT}/../CGAL_ImageIO/include ) if(EXISTS ${INC_DIR}) include_directories (BEFORE ${INC_DIR}) endif() endforeach() -foreach(LIB_DIR ${PACKAGE_ROOT}/../CGALimageIO/src/CGALImageIO) +foreach(LIB_DIR ${PACKAGE_ROOT}/../CGAL_ImageIO/src/CGAL_ImageIO) if (EXISTS ${LIB_DIR}) link_directories (${LIB_DIR}) endif() diff --git a/CGALimageIO/demo/CGALimageIO/image_to_vtk_viewer.cpp b/CGAL_ImageIO/demo/CGALimageIO/image_to_vtk_viewer.cpp similarity index 98% rename from CGALimageIO/demo/CGALimageIO/image_to_vtk_viewer.cpp rename to CGAL_ImageIO/demo/CGALimageIO/image_to_vtk_viewer.cpp index ad1dc7fd8d9..e52658623e5 100644 --- a/CGALimageIO/demo/CGALimageIO/image_to_vtk_viewer.cpp +++ b/CGAL_ImageIO/demo/CGALimageIO/image_to_vtk_viewer.cpp @@ -1,7 +1,7 @@ // This demo has been inspired from the file // Examples/Medical/Cxx/Medical1.cxx in VTK-5.0. -// Adaptation to CGALimageIO made by: Laurent Rineau +// Adaptation to CGAL_ImageIO made by: Laurent Rineau /* Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen diff --git a/CGALimageIO/dont_submit b/CGAL_ImageIO/dont_submit similarity index 100% rename from CGALimageIO/dont_submit rename to CGAL_ImageIO/dont_submit diff --git a/CGALimageIO/examples/CGALimageIO/CMakeLists.txt b/CGAL_ImageIO/examples/CGALimageIO/CMakeLists.txt similarity index 100% rename from CGALimageIO/examples/CGALimageIO/CMakeLists.txt rename to CGAL_ImageIO/examples/CGALimageIO/CMakeLists.txt diff --git a/CGALimageIO/examples/CGALimageIO/convert_raw_image_to_inr.cpp b/CGAL_ImageIO/examples/CGALimageIO/convert_raw_image_to_inr.cpp similarity index 100% rename from CGALimageIO/examples/CGALimageIO/convert_raw_image_to_inr.cpp rename to CGAL_ImageIO/examples/CGALimageIO/convert_raw_image_to_inr.cpp diff --git a/CGALimageIO/examples/CGALimageIO/test_imageio.cpp b/CGAL_ImageIO/examples/CGALimageIO/test_imageio.cpp similarity index 100% rename from CGALimageIO/examples/CGALimageIO/test_imageio.cpp rename to CGAL_ImageIO/examples/CGALimageIO/test_imageio.cpp diff --git a/CGALimageIO/include/CGAL/ImageIO.h b/CGAL_ImageIO/include/CGAL/ImageIO.h similarity index 100% rename from CGALimageIO/include/CGAL/ImageIO.h rename to CGAL_ImageIO/include/CGAL/ImageIO.h diff --git a/CGALimageIO/include/CGAL/Image_3.h b/CGAL_ImageIO/include/CGAL/Image_3.h similarity index 98% rename from CGALimageIO/include/CGAL/Image_3.h rename to CGAL_ImageIO/include/CGAL/Image_3.h index bf897af6228..993af24acc7 100644 --- a/CGALimageIO/include/CGAL/Image_3.h +++ b/CGAL_ImageIO/include/CGAL/Image_3.h @@ -75,7 +75,7 @@ public: protected: Image_shared_ptr image_ptr; - // implementation in src/CGALimageIO/Image_3.cpp + // implementation in src/CGAL_ImageIO/Image_3.cpp bool private_read(_image* im); public: @@ -166,13 +166,13 @@ public: bool read_vtk_image_data(vtkImageData*); #endif // CGAL_USE_VTK - // implementation in src/CGALimageIO/Image_3.cpp + // implementation in src/CGAL_ImageIO/Image_3.cpp void gl_draw(const float point_size, const unsigned char r, const unsigned char g, const unsigned char b); - // implementation in src/CGALimageIO/Image_3.cpp + // implementation in src/CGAL_ImageIO/Image_3.cpp void gl_draw_bbox(const float line_width, const unsigned char red, const unsigned char green, diff --git a/CGALimageIO/include/CGAL/Image_3_vtk_interface.h b/CGAL_ImageIO/include/CGAL/Image_3_vtk_interface.h similarity index 100% rename from CGALimageIO/include/CGAL/Image_3_vtk_interface.h rename to CGAL_ImageIO/include/CGAL/Image_3_vtk_interface.h diff --git a/CGALimageIO/include/CGAL/export/ImageIO.h b/CGAL_ImageIO/include/CGAL/export/ImageIO.h similarity index 100% rename from CGALimageIO/include/CGAL/export/ImageIO.h rename to CGAL_ImageIO/include/CGAL/export/ImageIO.h diff --git a/CGALimageIO/package_info/CGALimageIO/license.txt b/CGAL_ImageIO/package_info/CGALimageIO/license.txt similarity index 100% rename from CGALimageIO/package_info/CGALimageIO/license.txt rename to CGAL_ImageIO/package_info/CGALimageIO/license.txt diff --git a/CGALimageIO/package_info/CGALimageIO/maintainer b/CGAL_ImageIO/package_info/CGALimageIO/maintainer similarity index 100% rename from CGALimageIO/package_info/CGALimageIO/maintainer rename to CGAL_ImageIO/package_info/CGALimageIO/maintainer diff --git a/CGALimageIO/src/CGALImageIO/CMakeLists.txt b/CGAL_ImageIO/src/CGAL_ImageIO/CMakeLists.txt similarity index 88% rename from CGALimageIO/src/CGALImageIO/CMakeLists.txt rename to CGAL_ImageIO/src/CGAL_ImageIO/CMakeLists.txt index 48c8e5a7bee..d08f74f083f 100644 --- a/CGALimageIO/src/CGALImageIO/CMakeLists.txt +++ b/CGAL_ImageIO/src/CGAL_ImageIO/CMakeLists.txt @@ -3,7 +3,7 @@ message("Configuring libCGAL_ImageIO") find_package( OpenGL ) find_package( ZLIB ) -#option(WITH_VTK "Add VTK support to the CGAL ImageIO library." OFF) +#option(WITH_VTK "Add VTK support to libCGAL_ImageIO." OFF) if(WITH_VTK) find_package(VTK QUIET) @@ -52,7 +52,7 @@ if(OPENGL_FOUND) link_directories ( ${CGAL_LIBRARIES_DIR} ${CGAL_3RD_PARTY_LIBRARIES_DIRS} ) - collect_cgal_library( CGAL_ImageIO CGALImageIO "") + collect_cgal_library( CGAL_ImageIO "") add_dependencies( CGAL_ImageIO CGAL ) @@ -63,10 +63,10 @@ if(OPENGL_FOUND) message("libCGAL_ImageIO is configured") else(OPENGL_FOUND) - message( STATUS "CGAL_ImageIO needs OpenGL, cannot be configured.") + message( STATUS "libCGAL_ImageIO needs OpenGL, cannot be configured.") endif(OPENGL_FOUND) if(NOT ZLIB_FOUND) - message( STATUS "NOTICE: CGAL_ImageIO needs ZLib to read compressed files. That feature will not be activated.") + message( STATUS "NOTICE: libCGAL_ImageIO needs ZLib to read compressed files. That feature will not be activated.") endif(NOT ZLIB_FOUND) diff --git a/CGALimageIO/src/CGALImageIO/ImageIO.cpp b/CGAL_ImageIO/src/CGAL_ImageIO/ImageIO.cpp similarity index 100% rename from CGALimageIO/src/CGALImageIO/ImageIO.cpp rename to CGAL_ImageIO/src/CGAL_ImageIO/ImageIO.cpp diff --git a/CGALimageIO/src/CGALImageIO/Image_3.cpp b/CGAL_ImageIO/src/CGAL_ImageIO/Image_3.cpp similarity index 100% rename from CGALimageIO/src/CGALImageIO/Image_3.cpp rename to CGAL_ImageIO/src/CGAL_ImageIO/Image_3.cpp diff --git a/CGALimageIO/src/CGALImageIO/LICENSE b/CGAL_ImageIO/src/CGAL_ImageIO/LICENSE similarity index 100% rename from CGALimageIO/src/CGALImageIO/LICENSE rename to CGAL_ImageIO/src/CGAL_ImageIO/LICENSE diff --git a/CGALimageIO/src/CGALImageIO/analyze.cpp b/CGAL_ImageIO/src/CGAL_ImageIO/analyze.cpp similarity index 100% rename from CGALimageIO/src/CGALImageIO/analyze.cpp rename to CGAL_ImageIO/src/CGAL_ImageIO/analyze.cpp diff --git a/CGALimageIO/src/CGALImageIO/analyze.h b/CGAL_ImageIO/src/CGAL_ImageIO/analyze.h similarity index 100% rename from CGALimageIO/src/CGALImageIO/analyze.h rename to CGAL_ImageIO/src/CGAL_ImageIO/analyze.h diff --git a/CGALimageIO/src/CGALImageIO/bmp.cpp b/CGAL_ImageIO/src/CGAL_ImageIO/bmp.cpp similarity index 100% rename from CGALimageIO/src/CGALImageIO/bmp.cpp rename to CGAL_ImageIO/src/CGAL_ImageIO/bmp.cpp diff --git a/CGALimageIO/src/CGALImageIO/bmp.h b/CGAL_ImageIO/src/CGAL_ImageIO/bmp.h similarity index 100% rename from CGALimageIO/src/CGALImageIO/bmp.h rename to CGAL_ImageIO/src/CGAL_ImageIO/bmp.h diff --git a/CGALimageIO/src/CGALImageIO/bmpendian.cpp b/CGAL_ImageIO/src/CGAL_ImageIO/bmpendian.cpp similarity index 100% rename from CGALimageIO/src/CGALImageIO/bmpendian.cpp rename to CGAL_ImageIO/src/CGAL_ImageIO/bmpendian.cpp diff --git a/CGALimageIO/src/CGALImageIO/bmpendian.h b/CGAL_ImageIO/src/CGAL_ImageIO/bmpendian.h similarity index 100% rename from CGALimageIO/src/CGALImageIO/bmpendian.h rename to CGAL_ImageIO/src/CGAL_ImageIO/bmpendian.h diff --git a/CGALimageIO/src/CGALImageIO/bmpread.cpp b/CGAL_ImageIO/src/CGAL_ImageIO/bmpread.cpp similarity index 100% rename from CGALimageIO/src/CGALImageIO/bmpread.cpp rename to CGAL_ImageIO/src/CGAL_ImageIO/bmpread.cpp diff --git a/CGALimageIO/src/CGALImageIO/bmpread.h b/CGAL_ImageIO/src/CGAL_ImageIO/bmpread.h similarity index 100% rename from CGALimageIO/src/CGALImageIO/bmpread.h rename to CGAL_ImageIO/src/CGAL_ImageIO/bmpread.h diff --git a/CGALimageIO/src/CGALImageIO/bmptypes.h b/CGAL_ImageIO/src/CGAL_ImageIO/bmptypes.h similarity index 100% rename from CGALimageIO/src/CGALImageIO/bmptypes.h rename to CGAL_ImageIO/src/CGAL_ImageIO/bmptypes.h diff --git a/CGALimageIO/src/CGALImageIO/convert.cpp b/CGAL_ImageIO/src/CGAL_ImageIO/convert.cpp similarity index 100% rename from CGALimageIO/src/CGALImageIO/convert.cpp rename to CGAL_ImageIO/src/CGAL_ImageIO/convert.cpp diff --git a/CGALimageIO/src/CGALImageIO/convert.h b/CGAL_ImageIO/src/CGAL_ImageIO/convert.h similarity index 100% rename from CGALimageIO/src/CGALImageIO/convert.h rename to CGAL_ImageIO/src/CGAL_ImageIO/convert.h diff --git a/CGALimageIO/src/CGALImageIO/fgetns.cpp b/CGAL_ImageIO/src/CGAL_ImageIO/fgetns.cpp similarity index 100% rename from CGALimageIO/src/CGALImageIO/fgetns.cpp rename to CGAL_ImageIO/src/CGAL_ImageIO/fgetns.cpp diff --git a/CGALimageIO/src/CGALImageIO/fgetns.h b/CGAL_ImageIO/src/CGAL_ImageIO/fgetns.h similarity index 100% rename from CGALimageIO/src/CGALImageIO/fgetns.h rename to CGAL_ImageIO/src/CGAL_ImageIO/fgetns.h diff --git a/CGALimageIO/src/CGALImageIO/gif.cpp b/CGAL_ImageIO/src/CGAL_ImageIO/gif.cpp similarity index 100% rename from CGALimageIO/src/CGALImageIO/gif.cpp rename to CGAL_ImageIO/src/CGAL_ImageIO/gif.cpp diff --git a/CGALimageIO/src/CGALImageIO/gif.h b/CGAL_ImageIO/src/CGAL_ImageIO/gif.h similarity index 100% rename from CGALimageIO/src/CGALImageIO/gif.h rename to CGAL_ImageIO/src/CGAL_ImageIO/gif.h diff --git a/CGALimageIO/src/CGALImageIO/gis.cpp b/CGAL_ImageIO/src/CGAL_ImageIO/gis.cpp similarity index 100% rename from CGALimageIO/src/CGALImageIO/gis.cpp rename to CGAL_ImageIO/src/CGAL_ImageIO/gis.cpp diff --git a/CGALimageIO/src/CGALImageIO/gis.h b/CGAL_ImageIO/src/CGAL_ImageIO/gis.h similarity index 100% rename from CGALimageIO/src/CGALImageIO/gis.h rename to CGAL_ImageIO/src/CGAL_ImageIO/gis.h diff --git a/CGALimageIO/src/CGALImageIO/inr.cpp b/CGAL_ImageIO/src/CGAL_ImageIO/inr.cpp similarity index 100% rename from CGALimageIO/src/CGALImageIO/inr.cpp rename to CGAL_ImageIO/src/CGAL_ImageIO/inr.cpp diff --git a/CGALimageIO/src/CGALImageIO/inr.h b/CGAL_ImageIO/src/CGAL_ImageIO/inr.h similarity index 100% rename from CGALimageIO/src/CGALImageIO/inr.h rename to CGAL_ImageIO/src/CGAL_ImageIO/inr.h diff --git a/CGALimageIO/src/CGALImageIO/iris.cpp b/CGAL_ImageIO/src/CGAL_ImageIO/iris.cpp similarity index 100% rename from CGALimageIO/src/CGALImageIO/iris.cpp rename to CGAL_ImageIO/src/CGAL_ImageIO/iris.cpp diff --git a/CGALimageIO/src/CGALImageIO/iris.h b/CGAL_ImageIO/src/CGAL_ImageIO/iris.h similarity index 100% rename from CGALimageIO/src/CGALImageIO/iris.h rename to CGAL_ImageIO/src/CGAL_ImageIO/iris.h diff --git a/CGALimageIO/src/CGALImageIO/mincio.cpp b/CGAL_ImageIO/src/CGAL_ImageIO/mincio.cpp similarity index 100% rename from CGALimageIO/src/CGALImageIO/mincio.cpp rename to CGAL_ImageIO/src/CGAL_ImageIO/mincio.cpp diff --git a/CGALimageIO/src/CGALImageIO/mincio.h b/CGAL_ImageIO/src/CGAL_ImageIO/mincio.h similarity index 100% rename from CGALimageIO/src/CGALImageIO/mincio.h rename to CGAL_ImageIO/src/CGAL_ImageIO/mincio.h diff --git a/CGALimageIO/src/CGALImageIO/pnm.cpp b/CGAL_ImageIO/src/CGAL_ImageIO/pnm.cpp similarity index 100% rename from CGALimageIO/src/CGALImageIO/pnm.cpp rename to CGAL_ImageIO/src/CGAL_ImageIO/pnm.cpp diff --git a/CGALimageIO/src/CGALImageIO/pnm.h b/CGAL_ImageIO/src/CGAL_ImageIO/pnm.h similarity index 100% rename from CGALimageIO/src/CGALImageIO/pnm.h rename to CGAL_ImageIO/src/CGAL_ImageIO/pnm.h diff --git a/CGALimageIO/src/CGALImageIO/recbuffer.cpp b/CGAL_ImageIO/src/CGAL_ImageIO/recbuffer.cpp similarity index 100% rename from CGALimageIO/src/CGALImageIO/recbuffer.cpp rename to CGAL_ImageIO/src/CGAL_ImageIO/recbuffer.cpp diff --git a/CGALimageIO/src/CGALImageIO/recbuffer.h b/CGAL_ImageIO/src/CGAL_ImageIO/recbuffer.h similarity index 100% rename from CGALimageIO/src/CGALImageIO/recbuffer.h rename to CGAL_ImageIO/src/CGAL_ImageIO/recbuffer.h diff --git a/CGALimageIO/src/CGALImageIO/recline.cpp b/CGAL_ImageIO/src/CGAL_ImageIO/recline.cpp similarity index 100% rename from CGALimageIO/src/CGALImageIO/recline.cpp rename to CGAL_ImageIO/src/CGAL_ImageIO/recline.cpp diff --git a/CGALimageIO/src/CGALImageIO/recline.h b/CGAL_ImageIO/src/CGAL_ImageIO/recline.h similarity index 100% rename from CGALimageIO/src/CGALImageIO/recline.h rename to CGAL_ImageIO/src/CGAL_ImageIO/recline.h diff --git a/CGALimageIO/src/CGALImageIO/reech4x4.cpp b/CGAL_ImageIO/src/CGAL_ImageIO/reech4x4.cpp similarity index 100% rename from CGALimageIO/src/CGALImageIO/reech4x4.cpp rename to CGAL_ImageIO/src/CGAL_ImageIO/reech4x4.cpp diff --git a/CGALimageIO/src/CGALImageIO/reech4x4.h b/CGAL_ImageIO/src/CGAL_ImageIO/reech4x4.h similarity index 100% rename from CGALimageIO/src/CGALImageIO/reech4x4.h rename to CGAL_ImageIO/src/CGAL_ImageIO/reech4x4.h diff --git a/CGALimageIO/src/CGALImageIO/typedefs.h b/CGAL_ImageIO/src/CGAL_ImageIO/typedefs.h similarity index 100% rename from CGALimageIO/src/CGALImageIO/typedefs.h rename to CGAL_ImageIO/src/CGAL_ImageIO/typedefs.h diff --git a/CGALimageIO/test/CGALimageIO/CMakeLists.txt b/CGAL_ImageIO/test/CGAL_ImageIO/CMakeLists.txt similarity index 100% rename from CGALimageIO/test/CGALimageIO/CMakeLists.txt rename to CGAL_ImageIO/test/CGAL_ImageIO/CMakeLists.txt diff --git a/CGALimageIO/test/CGALimageIO/test_trilinear_interpolation.cpp b/CGAL_ImageIO/test/CGAL_ImageIO/test_trilinear_interpolation.cpp similarity index 100% rename from CGALimageIO/test/CGALimageIO/test_trilinear_interpolation.cpp rename to CGAL_ImageIO/test/CGAL_ImageIO/test_trilinear_interpolation.cpp diff --git a/CGAL_ipelets/demo/CGAL_ipelets/CMakeLists.txt b/CGAL_ipelets/demo/CGAL_ipelets/CMakeLists.txt index a2e2a902c19..891cf6ca41b 100644 --- a/CGAL_ipelets/demo/CGAL_ipelets/CMakeLists.txt +++ b/CGAL_ipelets/demo/CGAL_ipelets/CMakeLists.txt @@ -22,7 +22,6 @@ endmacro() set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}") set( IPE_VERSION "AUTODETECT" CACHE STRING "The version of Ipe. Only 6 and 7 are supported.") -set ( IPELET_INSTALL_DIR ${IPELET_INSTALL_DIR} CACHE STRING "The folder where ipelets will be installed, relative to CMAKE_INSTALL_PREFIX" ) find_package(CGAL QUIET COMPONENTS Core IPE) @@ -64,10 +63,11 @@ if ( CGAL_FOUND ) if (WITH_IPE_7) remove_leading_zero(IPE_MINOR_VERSION_1) remove_leading_zero(IPE_MINOR_VERSION_2) - set(INSTALL_PATHS ${INSTALL_PATHS} "${IPE_LIBRARY_DIR}/ipe/7.${IPE_MINOR_VERSION_1}.${IPE_MINOR_VERSION_2}/ipelets/") + set(INSTALL_PATHS "${IPE_LIBRARY_DIR}/ipe/7.${IPE_MINOR_VERSION_1}.${IPE_MINOR_VERSION_2}/ipelets/") find_path(IPELET_INSTALL_DIR NAMES libgoodies.lua goodies.lua PATHS ${INSTALL_PATHS} + DOC "The folder where ipelets will be installed" ENV IPELETPATH ) else() @@ -108,11 +108,14 @@ if ( CGAL_FOUND ) set(CGAL_IPELETS ${CGAL_IPELETS} skeleton) set(CGAL_IPELETS ${CGAL_IPELETS} triangulation) + if ( IPELET_INSTALL_DIR ) + message(STATUS "Set Ipelets install dir: ${IPELET_INSTALL_DIR}") + endif() + foreach(IPELET ${CGAL_IPELETS}) add_library(CGAL_${IPELET} MODULE ${IPELET}.cpp) add_to_cached_list(CGAL_EXECUTABLE_TARGETS CGAL_${IPELET}) if ( IPELET_INSTALL_DIR ) - message(STATUS "Set Ipelets install dir: ${IPELET_INSTALL_DIR}") install(TARGETS CGAL_${IPELET} DESTINATION ${IPELET_INSTALL_DIR}) if (WITH_IPE_7) install(FILES ./lua/libCGAL_${IPELET}.lua DESTINATION ${IPELET_INSTALL_DIR}) #only for ipe 7 diff --git a/Circulator/include/CGAL/circulator.h b/Circulator/include/CGAL/circulator.h index 6875ef8989b..9efc045bc9c 100644 --- a/Circulator/include/CGAL/circulator.h +++ b/Circulator/include/CGAL/circulator.h @@ -30,6 +30,7 @@ #include #include #include +#include // These are name redefinitions for backwards compatibility // with the pre iterator-traits style adaptors. @@ -743,6 +744,7 @@ public: // OPERATIONS bool operator==( Nullptr_t p) const { + CGAL_USE(p); CGAL_assertion( p == NULL); return (ctnr == NULL) || (ctnr->begin() == ctnr->end()); } @@ -876,6 +878,7 @@ public: // OPERATIONS bool operator==( Nullptr_t p) const { + CGAL_USE(p); CGAL_assertion( p == NULL); return (ctnr == NULL) || (ctnr->begin() == ctnr->end()); } @@ -1028,6 +1031,7 @@ public: // OPERATIONS bool operator==( Nullptr_t p) const { + CGAL_USE(p); CGAL_assertion( p == NULL); return empty; } diff --git a/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/Reflex_vertex_searcher.h b/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/Reflex_vertex_searcher.h index 6b45e737c91..9b250f6730b 100644 --- a/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/Reflex_vertex_searcher.h +++ b/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/Reflex_vertex_searcher.h @@ -72,11 +72,11 @@ class Reflex_vertex_searcher : public Modifier_basesource()->source()]==3) return; int isrse = is_reflex_sedge(se, dir); diff --git a/Generator/benchmark/Generator/CMakeLists.txt b/Generator/benchmark/Generator/CMakeLists.txt index 608d7227351..5f0ee4e9795 100644 --- a/Generator/benchmark/Generator/CMakeLists.txt +++ b/Generator/benchmark/Generator/CMakeLists.txt @@ -20,10 +20,10 @@ if ( CGAL_FOUND ) include( ${CGAL_USE_FILE} ) find_package(Boost REQUIRED program_options) - - include_directories(${Boost_INCLUDE_DIRS}) - link_libraries(${Boost_LIBRARIES}) - + include_directories(${Boost_PROGRAM_OPTIONS_INCLUDE_DIR}) + add_definitions( "-DCGAL_USE_BOOST_PROGRAM_OPTIONS" ) + list(APPEND CGAL_3RD_PARTY_LIBRARIES ${Boost_PROGRAM_OPTIONS_LIBRARY}) + include( CGAL_CreateSingleSourceCGALProgram ) include_directories (BEFORE ../../include) diff --git a/GraphicsView/src/CGALQt4/CMakeLists.txt b/GraphicsView/src/CGAL_Qt4/CMakeLists.txt similarity index 90% rename from GraphicsView/src/CGALQt4/CMakeLists.txt rename to GraphicsView/src/CGAL_Qt4/CMakeLists.txt index d956c43d59b..880051ab99b 100644 --- a/GraphicsView/src/CGALQt4/CMakeLists.txt +++ b/GraphicsView/src/CGAL_Qt4/CMakeLists.txt @@ -40,7 +40,7 @@ if( QT4_FOUND ) set(RESOURCE_FILES "") foreach (package ${CGAL_CONFIGURED_PACKAGES} ) - file(GLOB PACKAGE_QTMOC_FILES "${package}/src/CGALQt4/*.qtmoc.cmake") + file(GLOB PACKAGE_QTMOC_FILES "${package}/src/CGAL_Qt4/*.qtmoc.cmake") foreach(package_qtmoc_file ${PACKAGE_QTMOC_FILES}) # includes 'moccing' for sources/headers in package + collects lists of moc-files for dependency (to properly build the lib) include(${package_qtmoc_file}) @@ -63,7 +63,7 @@ if( QT4_FOUND ) link_directories ( ${CGAL_LIBRARIES_DIR} ${CGAL_3RD_PARTY_LIBRARIES_DIRS} ) - collect_cgal_library( CGAL_Qt4 CGALQt4 "${additional_files}") + collect_cgal_library( CGAL_Qt4 "${additional_files}") add_dependencies( CGAL_Qt4 CGAL ) @@ -78,9 +78,9 @@ if( QT4_FOUND ) message("libCGAL_Qt4 is configured") else() - message( STATUS "CGAL_Qt4 needs OpenGL, cannot be configured.") + message( STATUS "libCGAL_Qt4 needs OpenGL, cannot be configured.") endif() else() - message( STATUS "CGAL_Qt4 needs Qt4, cannot be configured.") + message( STATUS "libCGAL_Qt4 needs Qt4, cannot be configured.") endif() diff --git a/GraphicsView/src/CGALQt4/DemosMainWindow.cpp b/GraphicsView/src/CGAL_Qt4/DemosMainWindow.cpp similarity index 100% rename from GraphicsView/src/CGALQt4/DemosMainWindow.cpp rename to GraphicsView/src/CGAL_Qt4/DemosMainWindow.cpp diff --git a/GraphicsView/src/CGALQt4/GraphicsView.qtmoc.cmake b/GraphicsView/src/CGAL_Qt4/GraphicsView.qtmoc.cmake similarity index 100% rename from GraphicsView/src/CGALQt4/GraphicsView.qtmoc.cmake rename to GraphicsView/src/CGAL_Qt4/GraphicsView.qtmoc.cmake diff --git a/GraphicsView/src/CGALQt4/GraphicsViewNavigation.cpp b/GraphicsView/src/CGAL_Qt4/GraphicsViewNavigation.cpp similarity index 100% rename from GraphicsView/src/CGALQt4/GraphicsViewNavigation.cpp rename to GraphicsView/src/CGAL_Qt4/GraphicsViewNavigation.cpp diff --git a/GraphicsView/src/CGALQt4/GraphicsViewPolylineInput.cpp b/GraphicsView/src/CGAL_Qt4/GraphicsViewPolylineInput.cpp similarity index 100% rename from GraphicsView/src/CGALQt4/GraphicsViewPolylineInput.cpp rename to GraphicsView/src/CGAL_Qt4/GraphicsViewPolylineInput.cpp diff --git a/GraphicsView/src/CGALQt4/debug.cpp b/GraphicsView/src/CGAL_Qt4/debug.cpp similarity index 100% rename from GraphicsView/src/CGALQt4/debug.cpp rename to GraphicsView/src/CGAL_Qt4/debug.cpp diff --git a/GraphicsView/src/CGALQt4/resources.cpp b/GraphicsView/src/CGAL_Qt4/resources.cpp similarity index 100% rename from GraphicsView/src/CGALQt4/resources.cpp rename to GraphicsView/src/CGAL_Qt4/resources.cpp diff --git a/GraphicsView/src/CGALQt4/utility.cpp b/GraphicsView/src/CGAL_Qt4/utility.cpp similarity index 100% rename from GraphicsView/src/CGALQt4/utility.cpp rename to GraphicsView/src/CGAL_Qt4/utility.cpp diff --git a/Installation/CHANGES b/Installation/CHANGES index 04d8d22c79a..9ef0ce90e04 100644 --- a/Installation/CHANGES +++ b/Installation/CHANGES @@ -6,8 +6,11 @@ Release date: * Installation - - CGAL-4.1 no longer supports the Intel Compiler version 11.0. The Intel - Compiler version 12.0 is supported instead. + - Additional supported platforms: + + - The Apple Clang compiler versions 3.1 and 3.2 are now supported on + Mac OS X. + - Improved configuration for essential and optional external third party software @@ -20,19 +23,20 @@ Release date: 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). -* 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/CMakeLists.txt b/Installation/CMakeLists.txt index 8e7647e029d..f724a84744d 100644 --- a/Installation/CMakeLists.txt +++ b/Installation/CMakeLists.txt @@ -578,7 +578,12 @@ cache_set(CGAL_3RD_PARTY_LIBRARIES "" ) cache_set(CGAL_3RD_PARTY_LIBRARIES_DIRS "" ) # default is on, but some use-cases need to set it to off, e.g., debian packages -option( CGAL_ENABLE_PRECONFIG "Select to allow to preconfiguration of external libraries" ON) +## Laurent Rineau: hide this variable. Currently the configuration fails if +## it is set to false. (2012/08/16) +#option( CGAL_ENABLE_PRECONFIG "Select to allow to preconfiguration of external libraries" ON) +set( CGAL_ENABLE_PRECONFIG ON CACHE INTERNAL "Select to allow to use all preconfigured external libraries") + + # additional info: some header files in CGAL add additional code if # certain optional libs are installed, and some examples/tests rely on # this; e.g. in MPFI/RS in Algebraic_kernel_d. For these cases CGAL @@ -768,21 +773,26 @@ endif() # #-------------------------------------------------------------------------------------------------- -# Set CGAL_LIBRARY_NAME, CGAL_Qt3_LIBRARY_NAME and so on. Those variables -# are the name of CGAL libraries, without the path. Used in the generation -# of the installed CGALConfig.cmake -get_filename_component(CGAL_LIBRARY_NAME "${CGAL_LIBRARY}" NAME) -hide_variable(CGAL_LIBRARY_NAME) -foreach(lib ${CGAL_CONFIGURED_LIBRARIES}) - get_filename_component(CGAL_${lib}_LIBRARY_NAME "${CGAL_${lib}_LIBRARY}" NAME) - hide_variable(CGAL_${lib}_LIBRARY_NAME) -endforeach() - # fake to simplify loop set(CGAL_CGAL_LIBRARY ${CGAL_LIBRARY}) hide_variable(CGAL_CGAL_LIBRARY) -set(CGAL_CGAL_LIBRARY_NAME ${CGAL_LIBRARY_NAME}) -hide_variable(CGAL_CGAL_LIBRARY_NAME) + +# Set CGAL_INSTALLED_LIBRARY, CGAL_INSTALLED_Qt3_LIBRARY and so on. Those +# variables are the path to the libraries installed by the install +# target. Used in the generation of the installed CGALConfig.cmake +foreach(lib ${CGAL_CONFIGURED_LIBRARIES} CGAL) # note the added fake 'CGAL' + if(CGAL_${lib}_LIBRARY) + get_filename_component(lib_name "${CGAL_${lib}_LIBRARY}" NAME) + set(CGAL_INSTALLED_${lib}_LIBRARY "${CMAKE_INSTALL_PREFIX}/${CGAL_INSTALL_LIB_DIR}/${lib_name}") + else() + set(CGAL_INSTALLED_${lib}_LIBRARY "") + endif() + hide_variable(CGAL_INSTALLED_${lib}_LIBRARY) +endforeach() + +# set back from the fake +set(CGAL_INSTALLED_LIBRARY ${CGAL_INSTALLED_CGAL_LIBRARY}) +hide_variable(CGAL_INSTALLED_LIBRARY) create_CGALconfig_files() @@ -889,6 +899,7 @@ if ( NOT RUNNING_CGAL_AUTO_TEST ) add_programs(examples examples OFF ) add_programs(demo demos OFF ) + add_programs(test tests OFF ) endif() diff --git a/Installation/LICENSE b/Installation/LICENSE index 948be6d1391..c33b0a776e5 100644 --- a/Installation/LICENSE +++ b/Installation/LICENSE @@ -27,9 +27,9 @@ Distributed along with CGAL (for the users' convenience), but not part of CGAL, are the following third-party libraries, available under their own licenses: -- CORE, in the directories "include/CGAL/CORE" and "src/CGALCore", is +- CORE, in the directories "include/CGAL/CORE" and "src/CGAL_Core", is licensed under the LGPL (see LICENSE.LGPL). -- ImageIO, in the directory "src/CGALimageIO", is licensed under the LGPL +- ImageIO, in the directory "src/CGAL_ImageIO", is licensed under the LGPL (see LICENSE.LGPL). - OpenNL, in the directory "include/CGAL/OpenNL", is licensed under the LGPL (see LICENSE.LGPL). diff --git a/Installation/changes.html b/Installation/changes.html index e2cfa16179f..a3ed3632290 100644 --- a/Installation/changes.html +++ b/Installation/changes.html @@ -109,8 +109,12 @@ 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.1 is supported instead.
    • +
  • Additional supported platforms: +
      +
    • The Apple Clang compiler versions 3.1 and 3.2 are now supported on + Mac OS X.
      • +
    +
  • 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.
    • diff --git a/Installation/cmake/modules/CGALConfig_binary.cmake.in b/Installation/cmake/modules/CGALConfig_binary.cmake.in index dbea688da31..193bf8bbb89 100644 --- a/Installation/cmake/modules/CGALConfig_binary.cmake.in +++ b/Installation/cmake/modules/CGALConfig_binary.cmake.in @@ -96,11 +96,12 @@ set(CGAL_CONFIGURED_LIBRARIES "@CGAL_CONFIGURED_LIBRARIES@") macro(check_cgal_component COMPONENT) - set( CGAL_LIB CGAL${COMPONENT} ) - + set( CGAL_LIB ${COMPONENT} ) + #message("LIB: ${CGAL_LIB}") + if ( "${CGAL_LIB}" STREQUAL "CGAL" ) - set( ${CGAL_LIB}_FOUND TRUE ) - set( CHECK_${CGAL_LIB}_ERROR_TAIL "" ) + set( CGAL_FOUND TRUE ) + set( CHECK_CGAL_ERROR_TAIL "" ) else() if ( WITH_${CGAL_LIB} ) set( ${CGAL_LIB}_FOUND TRUE ) @@ -116,16 +117,14 @@ macro(check_cgal_component COMPONENT) endmacro() -check_cgal_component("") # for CGAL itself +check_cgal_component("CGAL") foreach( CGAL_COMPONENT ${CGAL_FIND_COMPONENTS} ) - - list (FIND CGAL_CONFIGURED_LIBRARIES "${CGAL_COMPONENT}" POSITION) + list (FIND CGAL_CONFIGURED_LIBRARIES "CGAL_${CGAL_COMPONENT}" POSITION) if ("${POSITION}" STRGREATER "-1") # means: CGAL_COMPONENT is contained in list - check_cgal_component("_${CGAL_COMPONENT}") + check_cgal_component("CGAL_${CGAL_COMPONENT}") # TODO EBEB do something for supporting lib in check_component? endif() - endforeach() # Starting with cmake 2.6.3, CGAL_FIND_COMPONENTS is cleared out when find_package returns. diff --git a/Installation/cmake/modules/CGALConfig_install.cmake.in b/Installation/cmake/modules/CGALConfig_install.cmake.in index df6515bfaf2..900c0018a89 100644 --- a/Installation/cmake/modules/CGALConfig_install.cmake.in +++ b/Installation/cmake/modules/CGALConfig_install.cmake.in @@ -39,12 +39,12 @@ set(WITH_CGAL_ImageIO "@WITH_CGAL_ImageIO@" ) set(WITH_CGAL_Qt3 "@WITH_CGAL_Qt3@" ) set(WITH_CGAL_Qt4 "@WITH_CGAL_Qt4@" ) -set(CGAL_LIBRARY "@CMAKE_INSTALL_PREFIX@/@CGAL_INSTALL_LIB_DIR@/@CGAL_LIBRARY_NAME@") -set(CGAL_CGAL_LIBRARY "@CMAKE_INSTALL_PREFIX@/@CGAL_INSTALL_LIB_DIR@/@CGAL_CGAL_LIBRARY_NAME@") -set(CGAL_Core_LIBRARY "@CMAKE_INSTALL_PREFIX@/@CGAL_INSTALL_LIB_DIR@/@CGAL_Core_LIBRARY_NAME@") -set(CGAL_ImageIO_LIBRARY "@CMAKE_INSTALL_PREFIX@/@CGAL_INSTALL_LIB_DIR@/@CGAL_ImageIO_LIBRARY_NAME@") -set(CGAL_Qt3_LIBRARY "@CMAKE_INSTALL_PREFIX@/@CGAL_INSTALL_LIB_DIR@/@CGAL_Qt3_LIBRARY_NAME@" ) -set(CGAL_Qt4_LIBRARY "@CMAKE_INSTALL_PREFIX@/@CGAL_INSTALL_LIB_DIR@/@CGAL_Qt4_LIBRARY_NAME@" ) +set(CGAL_LIBRARY "@CGAL_INSTALLED_LIBRARY@") +set(CGAL_CGAL_LIBRARY "@CGAL_INSTALLED_CGAL_LIBRARY@") +set(CGAL_Core_LIBRARY "@CGAL_INSTALLED_Core_LIBRARY@") +set(CGAL_ImageIO_LIBRARY "@CGAL_INSTALLED_ImageIO_LIBRARY@") +set(CGAL_Qt3_LIBRARY "@CGAL_INSTALLED_Qt3_LIBRARY@") +set(CGAL_Qt4_LIBRARY "@CGAL_INSTALLED_Qt4_LIBRARY@") set(CGAL_3RD_PARTY_INCLUDE_DIRS "@CGAL_3RD_PARTY_INCLUDE_DIRS@" ) set(CGAL_3RD_PARTY_DEFINITIONS "@CGAL_3RD_PARTY_DEFINITIONS@" ) @@ -96,11 +96,12 @@ set(CGAL_CONFIGURED_LIBRARIES "@CGAL_CONFIGURED_LIBRARIES@") macro(check_cgal_component COMPONENT) - set( CGAL_LIB CGAL${COMPONENT} ) - + set( CGAL_LIB ${COMPONENT} ) + #message("LIB: ${CGAL_LIB}") + if ( "${CGAL_LIB}" STREQUAL "CGAL" ) - set( ${CGAL_LIB}_FOUND TRUE ) - set( CHECK_${CGAL_LIB}_ERROR_TAIL "" ) + set( CGAL_FOUND TRUE ) + set( CHECK_CGAL_ERROR_TAIL "" ) else() if ( WITH_${CGAL_LIB} ) set( ${CGAL_LIB}_FOUND TRUE ) @@ -116,16 +117,14 @@ macro(check_cgal_component COMPONENT) endmacro() -check_cgal_component("") # for CGAL itself +check_cgal_component("CGAL") foreach( CGAL_COMPONENT ${CGAL_FIND_COMPONENTS} ) - - list (FIND CGAL_CONFIGURED_LIBRARIES "${CGAL_COMPONENT}" POSITION) + list (FIND CGAL_CONFIGURED_LIBRARIES "CGAL_${CGAL_COMPONENT}" POSITION) if ("${POSITION}" STRGREATER "-1") # means: CGAL_COMPONENT is contained in list - check_cgal_component("_${CGAL_COMPONENT}") + check_cgal_component("CGAL_${CGAL_COMPONENT}") # TODO EBEB do something for supporting lib in check_component? endif() - endforeach() # Starting with cmake 2.6.3, CGAL_FIND_COMPONENTS is cleared out when find_package returns. diff --git a/Installation/cmake/modules/CGAL_CreateSingleSourceCGALProgram.cmake b/Installation/cmake/modules/CGAL_CreateSingleSourceCGALProgram.cmake index ababb2cea1f..eb5731e0853 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(firstfile "${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/UseCGAL.cmake b/Installation/cmake/modules/UseCGAL.cmake index 00b2de8710a..af05b46b0e1 100644 --- a/Installation/cmake/modules/UseCGAL.cmake +++ b/Installation/cmake/modules/UseCGAL.cmake @@ -43,7 +43,6 @@ if(NOT USE_CGAL_FILE_INCLUDED) add_definitions ( ${CGAL_3RD_PARTY_DEFINITIONS} ${CGAL_DEFINITIONS} ) link_directories ( ${CGAL_LIBRARIES_DIR} ${CGAL_3RD_PARTY_LIBRARIES_DIRS} ) - link_libraries ( ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} ) endif() diff --git a/Installation/doc_tex/Installation/installation.tex b/Installation/doc_tex/Installation/installation.tex index f42e9bda662..f5282a2164c 100644 --- a/Installation/doc_tex/Installation/installation.tex +++ b/Installation/doc_tex/Installation/installation.tex @@ -410,7 +410,7 @@ see \ref{sec:3partysoftwareconfig} to specify the location of 3rd party software. The libraries \stl\ (shipped with any compiler) and \boost\ are essential to all components (i.e.~libCGAL, -libCGAL\_Core, libCGAL\_imageIO, libCGAL\_Qt3 and libCGAL\_Qt4). +libCGAL\_Core, libCGAL\_ImageIO, libCGAL\_Qt3 and libCGAL\_Qt4). \subsection{Standard Template Library (\stl) \label{thirdparty:stl}} diff --git a/Installation/doc_tex/Installation/usage.tex b/Installation/doc_tex/Installation/usage.tex index af9e392dde0..8ab0763da14 100644 --- a/Installation/doc_tex/Installation/usage.tex +++ b/Installation/doc_tex/Installation/usage.tex @@ -120,7 +120,7 @@ this file within a \cmake\ script sets up include paths and libraries to link with \cgal\ and essential third party libraries. Beyond, \texttt{find\_package} can demand for \texttt{COMPONENTS} of \cgal, that is, all \cgal\ libraries libCGAL\_Core (``Core''), -libCGAL\_imageIO (``ImageIO'') , libCGAL\_Qt3 (``Qt3'') and libCGAL\_Qt4 +libCGAL\_ImageIO (``ImageIO'') , libCGAL\_Qt3 (``Qt3'') and libCGAL\_Qt4 (``Qt4'') or optional 3rd party software such as ``MPFI'', ``RS3'' or ``LAPACK''. A user is free to create the \texttt{CMakeLists.txt} without calling the script (manual creation). diff --git a/Installation/include/CGAL/use.h b/Installation/include/CGAL/use.h new file mode 100644 index 00000000000..fb513be303a --- /dev/null +++ b/Installation/include/CGAL/use.h @@ -0,0 +1,34 @@ +// Copyright (c) 2007 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 Lesser 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) : Sylvain Pion + +#ifndef CGAL_USE_H +#define CGAL_USE_H + +namespace CGAL { namespace internal { + +template < typename T > inline +void use(const T&) {} + +} } + +// CGAL_USE() is a macro which aims at removing "variable is unused" warnings. + +#define CGAL_USE(x) ::CGAL::internal::use(x) + +#endif // CGAL_USE_H diff --git a/Installation/src/CGAL/CMakeLists.txt b/Installation/src/CGAL/CMakeLists.txt index fc153457c3c..2d6af2a018e 100644 --- a/Installation/src/CGAL/CMakeLists.txt +++ b/Installation/src/CGAL/CMakeLists.txt @@ -8,7 +8,7 @@ add_definitions(${CGAL_3RD_PARTY_DEFINITIONS}) link_directories(${CGAL_3RD_PARTY_LIBRARIES_DIRS}) -collect_cgal_library(CGAL CGAL "") +collect_cgal_library(CGAL "") target_link_libraries(CGAL ${CGAL_3RD_PARTY_LIBRARIES}) diff --git a/Installation/src/CMakeLists.txt b/Installation/src/CMakeLists.txt index baa3a22f7ef..6caf13a6e13 100644 --- a/Installation/src/CMakeLists.txt +++ b/Installation/src/CMakeLists.txt @@ -1,4 +1,4 @@ -function (collect_cgal_library LIBRARY_NAME LIBRARY_DIR_NAME ADDITIONAL_FILES) +function (collect_cgal_library LIBRARY_NAME ADDITIONAL_FILES) # IMPORTANT: First delete all_files.cpp if (EXISTS ${CMAKE_CURRENT_BINARY_DIR}/all_files.cpp) file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/all_files.cpp) @@ -6,7 +6,7 @@ function (collect_cgal_library LIBRARY_NAME LIBRARY_DIR_NAME ADDITIONAL_FILES) # THEN collect *.cpp foreach (package ${CGAL_CONFIGURED_PACKAGES} ) - file(GLOB CGAL_LIBRARY_SOURCE_FILES_TMP ${package}/src/${LIBRARY_DIR_NAME}/*.cpp) + file(GLOB CGAL_LIBRARY_SOURCE_FILES_TMP ${package}/src/${LIBRARY_NAME}/*.cpp) list(APPEND CGAL_LIBRARY_SOURCE_FILES ${CGAL_LIBRARY_SOURCE_FILES_TMP}) endforeach() @@ -76,8 +76,8 @@ function (collect_cgal_library LIBRARY_NAME LIBRARY_DIR_NAME ADDITIONAL_FILES) endfunction() function( configure_component DIR COMPONENT ) - option( WITH_CGAL_${COMPONENT} "Enable CGAL component ${COMPONENT}" ON) - if ( WITH_CGAL_${COMPONENT}) + option( WITH_${COMPONENT} "Enable CGAL component ${COMPONENT}" ON) + if ( WITH_${COMPONENT}) add_subdirectory( ${DIR} ${COMPONENT} ) endif() endfunction() @@ -113,41 +113,38 @@ add_subdirectory(CGAL) set(CGAL_CONFIGURED_LIBRARIES "" PARENT_SCOPE) foreach(package ${CGAL_CONFIGURED_PACKAGES}) - file(GLOB CONFIGURED_LIBS_IN_PACKAGE ${package}/src/CGAL*/CMakeLists.txt) + file(GLOB CONFIGURED_LIBS_IN_PACKAGE ${package}/src/CGAL_*/CMakeLists.txt) foreach (libconfigfile ${CONFIGURED_LIBS_IN_PACKAGE}) string(REPLACE "${package}/src/" "" libconfigfile ${libconfigfile}) - string(REPLACE "//CMakeLists.txt" "" CGAL_CONFIGURED_LIBRARY_SUBDIR ${libconfigfile}) - if (NOT ${CGAL_CONFIGURED_LIBRARY_SUBDIR} STREQUAL "CGAL") + string(REPLACE "//CMakeLists.txt" "" CGAL_CONFIGURED_LIBRARY_NAME ${libconfigfile}) + if (NOT ${CGAL_CONFIGURED_LIBRARY_NAME} STREQUAL "CGAL") - string(REPLACE "CGAL" "" CGAL_CONFIGURED_LIBRARY_NAME ${CGAL_CONFIGURED_LIBRARY_SUBDIR}) - - message(STATUS "Sources for CGAL component library '${CGAL_CONFIGURED_LIBRARY_NAME}' detected") + message(STATUS "Sources for CGAL component library '${CGAL_CONFIGURED_LIBRARY_NAME}' detected") list(APPEND CGAL_CONFIGURED_LIBRARIES ${CGAL_CONFIGURED_LIBRARY_NAME}) #message(STATUS "Library config detected: ${CGAL_CONFIGURED_LIBRARIES}") - cache_set(CGAL_${CGAL_CONFIGURED_LIBRARY_NAME}_LIBRARY "" ) - - cache_set(CGAL_${CGAL_CONFIGURED_LIBRARY_NAME}_3RD_PARTY_DEFINITIONS "" ) - cache_set(CGAL_${CGAL_CONFIGURED_LIBRARY_NAME}_3RD_PARTY_INCLUDE_DIRS "" ) - cache_set(CGAL_${CGAL_CONFIGURED_LIBRARY_NAME}_3RD_PARTY_LIBRARIES "" ) - cache_set(CGAL_${CGAL_CONFIGURED_LIBRARY_NAME}_3RD_PARTY_LIBRARIES_DIRS "" ) + cache_set(${CGAL_CONFIGURED_LIBRARY_NAME}_LIBRARY "" ) + cache_set(${CGAL_CONFIGURED_LIBRARY_NAME}_3RD_PARTY_DEFINITIONS "" ) + cache_set(${CGAL_CONFIGURED_LIBRARY_NAME}_3RD_PARTY_INCLUDE_DIRS "" ) + cache_set(${CGAL_CONFIGURED_LIBRARY_NAME}_3RD_PARTY_LIBRARIES "" ) + cache_set(${CGAL_CONFIGURED_LIBRARY_NAME}_3RD_PARTY_LIBRARIES_DIRS "" ) if (${CGAL_CONFIGURED_LIBRARY_NAME} STREQUAL "Core") if (NOT CGAL_NO_CORE) - configure_component( ${package}/src/${CGAL_CONFIGURED_LIBRARY_SUBDIR} ${CGAL_CONFIGURED_LIBRARY_NAME}) + configure_component( ${package}/src/${CGAL_CONFIGURED_LIBRARY_NAME} ${CGAL_CONFIGURED_LIBRARY_NAME}) else(NOT CGAL_NO_CORE) message( STATUS "CGAL_Core is not being configured (missing GMP, or 64bit architecture).") endif(NOT CGAL_NO_CORE) else() - configure_component( ${package}/src/${CGAL_CONFIGURED_LIBRARY_SUBDIR} ${CGAL_CONFIGURED_LIBRARY_NAME}) + configure_component( ${package}/src/${CGAL_CONFIGURED_LIBRARY_NAME} ${CGAL_CONFIGURED_LIBRARY_NAME}) endif() - cache_get(CGAL_${CGAL_CONFIGURED_LIBRARY_NAME}_LIBRARY) + cache_get(${CGAL_CONFIGURED_LIBRARY_NAME}_LIBRARY) - cache_get(CGAL_${CGAL_CONFIGURED_LIBRARY_NAME}_3RD_PARTY_DEFINITIONS ) - cache_get(CGAL_${CGAL_CONFIGURED_LIBRARY_NAME}_3RD_PARTY_INCLUDE_DIRS ) - cache_get(CGAL_${CGAL_CONFIGURED_LIBRARY_NAME}_3RD_PARTY_LIBRARIES ) - cache_get(CGAL_${CGAL_CONFIGURED_LIBRARY_NAME}_3RD_PARTY_LIBRARIES_DIRS) + cache_get(${CGAL_CONFIGURED_LIBRARY_NAME}_3RD_PARTY_DEFINITIONS ) + cache_get(${CGAL_CONFIGURED_LIBRARY_NAME}_3RD_PARTY_INCLUDE_DIRS ) + cache_get(${CGAL_CONFIGURED_LIBRARY_NAME}_3RD_PARTY_LIBRARIES ) + cache_get(${CGAL_CONFIGURED_LIBRARY_NAME}_3RD_PARTY_LIBRARIES_DIRS) else() diff --git a/Installation/test/CMakeLists.txt b/Installation/test/CMakeLists.txt new file mode 100644 index 00000000000..f60aa41f777 --- /dev/null +++ b/Installation/test/CMakeLists.txt @@ -0,0 +1,42 @@ +project(CGAL_TESTS) + +cmake_minimum_required(VERSION 2.6.2) + +if (CGAL_BRANCH_BUILD) + +foreach (package ${CGAL_CONFIGURED_PACKAGES}) + #message (STATUS "Current package: ${package}") + file( GLOB listtmp "${package}/test/*") + list(APPEND list ${listtmp}) +endforeach() + +else() + + file( GLOB list "*") + +endif() + +list( SORT list ) + +if(NOT CGAL_BUILDING_LIBS) + find_package(CGAL REQUIRED) + include(${CGAL_MODULES_DIR}/CGAL_Macros.cmake) +endif() + +message("== Generating build files for tests ==") +foreach( entry ${list} ) + + if (NOT ${entry} MATCHES ".*\\.svn\$" AND IS_DIRECTORY ${entry} ) + + file(GLOB files "${entry}/*.cpp") + + # If there is no .cpp files, ignore the sub-directory + if(files) + process_CGAL_subdirectory("${entry}" test test) + # Note: process_CGAL_subdirectory is defined in cmake/modules/CGAL_Macros.cmake + endif() + + endif() + +endforeach() +message("== Generating build files for tests (DONE) ==\n") diff --git a/Intersections_2/include/CGAL/Intersections_2/Triangle_2_Triangle_2_intersection_impl.h b/Intersections_2/include/CGAL/Intersections_2/Triangle_2_Triangle_2_intersection_impl.h index 89bcc1a8039..153389f81e6 100644 --- a/Intersections_2/include/CGAL/Intersections_2/Triangle_2_Triangle_2_intersection_impl.h +++ b/Intersections_2/include/CGAL/Intersections_2/Triangle_2_Triangle_2_intersection_impl.h @@ -120,8 +120,8 @@ void _cut_off(Pointlist_2_ &list, last->next = newrec; newrec->side = ON_ORIENTED_BOUNDARY; Line_2_Line_2_pair linepair(&cutter, &l); - typename Line_2_Line_2_pair::Intersection_results isr; - isr = linepair.intersection_type(); + CGAL_kernel_assertion_code(typename Line_2_Line_2_pair::Intersection_results isr =) + linepair.intersection_type(); CGAL_kernel_assertion(isr == Line_2_Line_2_pair::POINT); newrec->point = linepair.intersection_point(); } diff --git a/Intersections_2/include/CGAL/Triangle_2_Triangle_2_do_intersect.h b/Intersections_2/include/CGAL/Triangle_2_Triangle_2_do_intersect.h index 2ba8d047649..401593d71d4 100644 --- a/Intersections_2/include/CGAL/Triangle_2_Triangle_2_do_intersect.h +++ b/Intersections_2/include/CGAL/Triangle_2_Triangle_2_do_intersect.h @@ -76,7 +76,8 @@ bool intersection_test_edge(const typename K::Point_2 * P1, const typename K::Point_2 * Q1, const typename K::Point_2 * R1, const typename K::Point_2 * P2, - const typename K::Point_2 * Q2, + const typename K::Point_2 * + CGAL_kernel_precondition_code(Q2), const typename K::Point_2 * R2, const K & k ){ diff --git a/Intersections_3/test/Intersections_3/bbox_other_do_intersect_test.cpp b/Intersections_3/test/Intersections_3/bbox_other_do_intersect_test.cpp index 3a0586e41e9..35557916a07 100644 --- a/Intersections_3/test/Intersections_3/bbox_other_do_intersect_test.cpp +++ b/Intersections_3/test/Intersections_3/bbox_other_do_intersect_test.cpp @@ -62,7 +62,7 @@ template bool test_aux(const T& t, const std::string& name, const CGAL::Bbox_3& bbox, - bool expected, bool exact_predicates = false) + bool expected, bool /*exact_predicates*/ = false) { bool b = CGAL::do_intersect(t,bbox); @@ -660,7 +660,7 @@ bool test(bool exact_kernel = false) } template -bool test_kernel(bool exact_predicates = true, K k = K()) +bool test_kernel(bool exact_predicates = true, K /*k*/ = K()) { bool b = test(exact_predicates) && intensive_test(exact_predicates); diff --git a/Jet_fitting_3/examples/Jet_fitting_3/CMakeLists.txt b/Jet_fitting_3/examples/Jet_fitting_3/CMakeLists.txt index 510ebe2ff23..cba16372add 100644 --- a/Jet_fitting_3/examples/Jet_fitting_3/CMakeLists.txt +++ b/Jet_fitting_3/examples/Jet_fitting_3/CMakeLists.txt @@ -42,10 +42,8 @@ if ( CGAL_FOUND ) message( STATUS "Boost.ProgramOptions library: ${Boost_PROGRAM_OPTIONS_LIBRARY}" ) endif() add_definitions( "-DCGAL_USE_BOOST_PROGRAM_OPTIONS" ) - if ( NOT CGAL_AUTO_LINK_ENABLED ) - link_libraries( ${Boost_PROGRAM_OPTIONS_LIBRARY} ) - endif() - endif() + list(APPEND CGAL_3RD_PARTY_LIBRARIES ${Boost_LIBRARIES}) + endif() create_single_source_cgal_program( "Mesh_estimation.cpp" ) create_single_source_cgal_program( "Single_estimation.cpp" ) diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_object.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_object.h index 12db9c3cb24..a40ad1de941 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_object.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_object.h @@ -23,10 +23,10 @@ #ifndef CGAL__TEST_CLS_OBJECT_H #define CGAL__TEST_CLS_OBJECT_H -#include +#include #include -using CGAL::use; +using CGAL::internal::use; // Test that we can derive from Object. diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_new_2.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_new_2.h index cfe390c5c24..338940b3d71 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_new_2.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_new_2.h @@ -33,9 +33,9 @@ #include "_test_cls_iso_rectangle_new_2.h" #include "_test_cls_circle_new_2.h" -#include +#include -using CGAL::use; +using CGAL::internal::use; template bool diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_new_3.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_new_3.h index d2d6a89db07..c9bff6f3003 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_new_3.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_new_3.h @@ -28,9 +28,9 @@ #include #include -#include +#include -using CGAL::use; +using CGAL::internal::use; // Accessory function testing functions that require sqrt(). // Doesn't instantiate anything if RT doesn't support sqrt(). diff --git a/Kernel_23/test/Kernel_23/include/CGAL/use.h b/Kernel_23/test/Kernel_23/include/CGAL/use.h deleted file mode 100644 index defc0e23c3c..00000000000 --- a/Kernel_23/test/Kernel_23/include/CGAL/use.h +++ /dev/null @@ -1,15 +0,0 @@ -// A macro which helps removing "unused variable" warnings. - -#ifndef CGAL_USE_H -#define CGAL_USE_H - -namespace CGAL { - -template < typename T > -inline void use(const T&) {} - -} // namespace CGAL - -#define CGAL_USE(x) CGAL::use(x); - -#endif diff --git a/Kernel_d/include/CGAL/Cartesian_d.h b/Kernel_d/include/CGAL/Cartesian_d.h index 2cc5bfbbcff..0a5a6e5b68e 100644 --- a/Kernel_d/include/CGAL/Cartesian_d.h +++ b/Kernel_d/include/CGAL/Cartesian_d.h @@ -342,7 +342,7 @@ public: static RT FT_numerator(const FT &r) { return r; } - static RT FT_denominator(const FT &r) + static RT FT_denominator(const FT & /*r*/) { return RT(1); } // special stuff for traits class character : diff --git a/Kinetic_data_structures/demo/Kinetic_data_structures/CMakeLists.txt b/Kinetic_data_structures/demo/Kinetic_data_structures/CMakeLists.txt index 33d66711882..77e59bab6a3 100644 --- a/Kinetic_data_structures/demo/Kinetic_data_structures/CMakeLists.txt +++ b/Kinetic_data_structures/demo/Kinetic_data_structures/CMakeLists.txt @@ -16,6 +16,8 @@ find_package(CGAL COMPONENTS Qt3 Core) if ( CGAL_FOUND ) include( ${CGAL_USE_FILE} ) + + include( CGAL_CreateSingleSourceCGALProgram ) find_package(Qt3-patched ) # FindQt3-patched.cmake is FindQt3.cmake patched by CGAL developers, so @@ -39,32 +41,14 @@ if ( CGAL_FOUND ) find_package(Boost COMPONENTS program_options) if(Boost_PROGRAM_OPTIONS_FOUND) add_definitions( "-DCGAL_USE_BOOST_PROGRAM_OPTIONS" ) - link_libraries( ${Boost_PROGRAM_OPTIONS_LIBRARY} ) + list(APPEND CGAL_3RD_PARTY_LIBRARIES ${Boost_PROGRAM_OPTIONS_LIBRARY}) endif() - # Demo KDS_Delaunay_triangulation_2 - add_executable (KDS_Delaunay_triangulation_2 KDS_Delaunay_triangulation_2.cpp) - target_link_libraries(KDS_Delaunay_triangulation_2 ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES}) - - add_to_cached_list( CGAL_EXECUTABLE_TARGETS KDS_Delaunay_triangulation_2 ) - - # Demo KDS_gui_2 - add_executable (KDS_gui_2 KDS_gui_2.cpp) - target_link_libraries(KDS_gui_2 ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES}) - - add_to_cached_list( CGAL_EXECUTABLE_TARGETS KDS_gui_2 ) - - # Demo KDS_generate_data - add_executable (KDS_generate_data KDS_generate_data.cpp) - target_link_libraries(KDS_generate_data ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES}) - add_to_cached_list( CGAL_EXECUTABLE_TARGETS KDS_generate_data ) - - # Demo KDS_Delaunay_triangulation_stable_subset_2 - add_executable (KDS_Delaunay_triangulation_stable_subset_2 KDS_Delaunay_triangulation_stable_subset_2.cpp) - target_link_libraries(KDS_Delaunay_triangulation_stable_subset_2 ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES}) - - add_to_cached_list( CGAL_EXECUTABLE_TARGETS KDS_Delaunay_triangulation_stable_subset_2 ) - + create_single_source_cgal_program( "KDS_Delaunay_triangulation_2.cpp" ) + create_single_source_cgal_program( "KDS_gui_2.cpp" ) + create_single_source_cgal_program( "KDS_generate_data.cpp") + create_single_source_cgal_program( "KDS_Delaunay_triangulation_stable_subset_2.cpp" ) + else() message(STATUS "NOTICE: This demo requires Qt3 and the CGAL Qt3 library, and will not be compiled.") diff --git a/Kinetic_data_structures/src/CGALQt3/Kinetic_Qt_core.cpp b/Kinetic_data_structures/src/CGAL_Qt3/Kinetic_Qt_core.cpp similarity index 100% rename from Kinetic_data_structures/src/CGALQt3/Kinetic_Qt_core.cpp rename to Kinetic_data_structures/src/CGAL_Qt3/Kinetic_Qt_core.cpp diff --git a/Kinetic_data_structures/src/CGALQt3/Kinetic_Qt_timer.cpp b/Kinetic_data_structures/src/CGAL_Qt3/Kinetic_Qt_timer.cpp similarity index 100% rename from Kinetic_data_structures/src/CGALQt3/Kinetic_Qt_timer.cpp rename to Kinetic_data_structures/src/CGAL_Qt3/Kinetic_Qt_timer.cpp diff --git a/Kinetic_data_structures/src/CGALQt3/Kinetic_Qt_widget_2_core.cpp b/Kinetic_data_structures/src/CGAL_Qt3/Kinetic_Qt_widget_2_core.cpp similarity index 100% rename from Kinetic_data_structures/src/CGALQt3/Kinetic_Qt_widget_2_core.cpp rename to Kinetic_data_structures/src/CGAL_Qt3/Kinetic_Qt_widget_2_core.cpp diff --git a/Kinetic_data_structures/src/CGALQt3/Kinetic_Qt_window_2.cpp b/Kinetic_data_structures/src/CGAL_Qt3/Kinetic_Qt_window_2.cpp similarity index 100% rename from Kinetic_data_structures/src/CGALQt3/Kinetic_Qt_window_2.cpp rename to Kinetic_data_structures/src/CGAL_Qt3/Kinetic_Qt_window_2.cpp diff --git a/Kinetic_data_structures/src/CGALQt3/Kinetic_data_structures.qtmoc.cmake b/Kinetic_data_structures/src/CGAL_Qt3/Kinetic_data_structures.qtmoc.cmake similarity index 100% rename from Kinetic_data_structures/src/CGALQt3/Kinetic_data_structures.qtmoc.cmake rename to Kinetic_data_structures/src/CGAL_Qt3/Kinetic_data_structures.qtmoc.cmake diff --git a/Kinetic_data_structures/src/CGALQt3/Kinetic_faster.xpm b/Kinetic_data_structures/src/CGAL_Qt3/Kinetic_faster.xpm similarity index 100% rename from Kinetic_data_structures/src/CGALQt3/Kinetic_faster.xpm rename to Kinetic_data_structures/src/CGAL_Qt3/Kinetic_faster.xpm diff --git a/Kinetic_data_structures/src/CGALQt3/Kinetic_pause.xpm b/Kinetic_data_structures/src/CGAL_Qt3/Kinetic_pause.xpm similarity index 100% rename from Kinetic_data_structures/src/CGALQt3/Kinetic_pause.xpm rename to Kinetic_data_structures/src/CGAL_Qt3/Kinetic_pause.xpm diff --git a/Kinetic_data_structures/src/CGALQt3/Kinetic_pixmaps.cpp b/Kinetic_data_structures/src/CGAL_Qt3/Kinetic_pixmaps.cpp similarity index 100% rename from Kinetic_data_structures/src/CGALQt3/Kinetic_pixmaps.cpp rename to Kinetic_data_structures/src/CGAL_Qt3/Kinetic_pixmaps.cpp diff --git a/Kinetic_data_structures/src/CGALQt3/Kinetic_play.xpm b/Kinetic_data_structures/src/CGAL_Qt3/Kinetic_play.xpm similarity index 100% rename from Kinetic_data_structures/src/CGALQt3/Kinetic_play.xpm rename to Kinetic_data_structures/src/CGAL_Qt3/Kinetic_play.xpm diff --git a/Kinetic_data_structures/src/CGALQt3/Kinetic_play_through.xpm b/Kinetic_data_structures/src/CGAL_Qt3/Kinetic_play_through.xpm similarity index 100% rename from Kinetic_data_structures/src/CGALQt3/Kinetic_play_through.xpm rename to Kinetic_data_structures/src/CGAL_Qt3/Kinetic_play_through.xpm diff --git a/Kinetic_data_structures/src/CGALQt3/Kinetic_play_to.xpm b/Kinetic_data_structures/src/CGAL_Qt3/Kinetic_play_to.xpm similarity index 100% rename from Kinetic_data_structures/src/CGALQt3/Kinetic_play_to.xpm rename to Kinetic_data_structures/src/CGAL_Qt3/Kinetic_play_to.xpm diff --git a/Kinetic_data_structures/src/CGALQt3/Kinetic_print.xpm b/Kinetic_data_structures/src/CGAL_Qt3/Kinetic_print.xpm similarity index 100% rename from Kinetic_data_structures/src/CGALQt3/Kinetic_print.xpm rename to Kinetic_data_structures/src/CGAL_Qt3/Kinetic_print.xpm diff --git a/Kinetic_data_structures/src/CGALQt3/Kinetic_reverse.xpm b/Kinetic_data_structures/src/CGAL_Qt3/Kinetic_reverse.xpm similarity index 100% rename from Kinetic_data_structures/src/CGALQt3/Kinetic_reverse.xpm rename to Kinetic_data_structures/src/CGAL_Qt3/Kinetic_reverse.xpm diff --git a/Kinetic_data_structures/src/CGALQt3/Kinetic_slower.xpm b/Kinetic_data_structures/src/CGAL_Qt3/Kinetic_slower.xpm similarity index 100% rename from Kinetic_data_structures/src/CGALQt3/Kinetic_slower.xpm rename to Kinetic_data_structures/src/CGAL_Qt3/Kinetic_slower.xpm diff --git a/Kinetic_data_structures/src/CGALQt3/Kinetic_stop.xpm b/Kinetic_data_structures/src/CGAL_Qt3/Kinetic_stop.xpm similarity index 100% rename from Kinetic_data_structures/src/CGALQt3/Kinetic_stop.xpm rename to Kinetic_data_structures/src/CGAL_Qt3/Kinetic_stop.xpm diff --git a/Linear_cell_complex/examples/Linear_cell_complex/linear_cell_complex_3_triangulation.cpp b/Linear_cell_complex/examples/Linear_cell_complex/linear_cell_complex_3_triangulation.cpp index 8805c22db94..49f3ffcb46b 100644 --- a/Linear_cell_complex/examples/Linear_cell_complex/linear_cell_complex_3_triangulation.cpp +++ b/Linear_cell_complex/examples/Linear_cell_complex/linear_cell_complex_3_triangulation.cpp @@ -1,23 +1,3 @@ -// Copyright (c) 2011 CNRS and LIRIS' Establishments (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 Lesser 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) : Guillaume Damiand -// Vivek Mahajan -// #include #include #include diff --git a/Linear_cell_complex/examples/Linear_cell_complex/plane_graph_to_lcc_2.cpp b/Linear_cell_complex/examples/Linear_cell_complex/plane_graph_to_lcc_2.cpp index d849a9b22b5..f62cbc3c0c9 100644 --- a/Linear_cell_complex/examples/Linear_cell_complex/plane_graph_to_lcc_2.cpp +++ b/Linear_cell_complex/examples/Linear_cell_complex/plane_graph_to_lcc_2.cpp @@ -1,22 +1,3 @@ -// Copyright (c) 2011 CNRS and LIRIS' Establishments (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 Lesser 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) : Guillaume Damiand -// #include #include #include diff --git a/Linear_cell_complex/examples/Linear_cell_complex/voronoi_2.cpp b/Linear_cell_complex/examples/Linear_cell_complex/voronoi_2.cpp index f9a98e6d13d..f0997f0902d 100644 --- a/Linear_cell_complex/examples/Linear_cell_complex/voronoi_2.cpp +++ b/Linear_cell_complex/examples/Linear_cell_complex/voronoi_2.cpp @@ -1,22 +1,3 @@ -// Copyright (c) 2011 CNRS and LIRIS' Establishments (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 Lesser 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) : Guillaume Damiand -// #include #include #include diff --git a/Linear_cell_complex/examples/Linear_cell_complex/voronoi_3.cpp b/Linear_cell_complex/examples/Linear_cell_complex/voronoi_3.cpp index 22e80359ae1..8b3367e9860 100644 --- a/Linear_cell_complex/examples/Linear_cell_complex/voronoi_3.cpp +++ b/Linear_cell_complex/examples/Linear_cell_complex/voronoi_3.cpp @@ -1,22 +1,3 @@ -// Copyright (c) 2011 CNRS and LIRIS' Establishments (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 Lesser 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) : Guillaume Damiand -// #include #include #include diff --git a/Maintenance/deb/sid/debian/copyright b/Maintenance/deb/sid/debian/copyright index 269a926c941..c41b8d4266d 100644 --- a/Maintenance/deb/sid/debian/copyright +++ b/Maintenance/deb/sid/debian/copyright @@ -164,9 +164,9 @@ Copyright (from upstream file LICENSE) CGAL, are the following third-party libraries, available under their own licenses: - - CORE, in the directories "include/CGAL/CORE" and "src/CGALCore", is + - CORE, in the directories "include/CGAL/CORE" and "src/CGAL_Core", is licensed under the LGPL (see LICENSE.LGPL). - - ImageIO, in the directory "src/CGALimageIO", is licensed under the LGPL + - ImageIO, in the directory "src/CGAL_ImageIO", is licensed under the LGPL (see LICENSE.LGPL). - OpenNL, in the directory "include/CGAL/OpenNL", is licensed under the LGPL (see LICENSE.LGPL). @@ -312,7 +312,7 @@ CORE ==== The following copyright statement applies to the CORE library in -src/CGALCore and include/CGAL/CORE. +src/CGAL_Core and include/CGAL/CORE. Core Library Version 1.7, August 2004 Copyright (c) 1995-2004 Exact Computation Project @@ -336,7 +336,7 @@ ImageIO ======= The following copyright statement applies to the ImageIO library in -src/CGALimageIO. +src/CGAL_ImageIO. Copyright (c) 2005, 2006 ASCLEPIOS Project, INRIA Sophia-Antipolis (France) All rights reserved. diff --git a/Maintenance/deb/squeeze/debian/copyright b/Maintenance/deb/squeeze/debian/copyright index 269a926c941..c41b8d4266d 100644 --- a/Maintenance/deb/squeeze/debian/copyright +++ b/Maintenance/deb/squeeze/debian/copyright @@ -164,9 +164,9 @@ Copyright (from upstream file LICENSE) CGAL, are the following third-party libraries, available under their own licenses: - - CORE, in the directories "include/CGAL/CORE" and "src/CGALCore", is + - CORE, in the directories "include/CGAL/CORE" and "src/CGAL_Core", is licensed under the LGPL (see LICENSE.LGPL). - - ImageIO, in the directory "src/CGALimageIO", is licensed under the LGPL + - ImageIO, in the directory "src/CGAL_ImageIO", is licensed under the LGPL (see LICENSE.LGPL). - OpenNL, in the directory "include/CGAL/OpenNL", is licensed under the LGPL (see LICENSE.LGPL). @@ -312,7 +312,7 @@ CORE ==== The following copyright statement applies to the CORE library in -src/CGALCore and include/CGAL/CORE. +src/CGAL_Core and include/CGAL/CORE. Core Library Version 1.7, August 2004 Copyright (c) 1995-2004 Exact Computation Project @@ -336,7 +336,7 @@ ImageIO ======= The following copyright statement applies to the ImageIO library in -src/CGALimageIO. +src/CGAL_ImageIO. Copyright (c) 2005, 2006 ASCLEPIOS Project, INRIA Sophia-Antipolis (France) All rights reserved. diff --git a/Maintenance/deb/wheezy/debian/copyright b/Maintenance/deb/wheezy/debian/copyright index 269a926c941..c41b8d4266d 100644 --- a/Maintenance/deb/wheezy/debian/copyright +++ b/Maintenance/deb/wheezy/debian/copyright @@ -164,9 +164,9 @@ Copyright (from upstream file LICENSE) CGAL, are the following third-party libraries, available under their own licenses: - - CORE, in the directories "include/CGAL/CORE" and "src/CGALCore", is + - CORE, in the directories "include/CGAL/CORE" and "src/CGAL_Core", is licensed under the LGPL (see LICENSE.LGPL). - - ImageIO, in the directory "src/CGALimageIO", is licensed under the LGPL + - ImageIO, in the directory "src/CGAL_ImageIO", is licensed under the LGPL (see LICENSE.LGPL). - OpenNL, in the directory "include/CGAL/OpenNL", is licensed under the LGPL (see LICENSE.LGPL). @@ -312,7 +312,7 @@ CORE ==== The following copyright statement applies to the CORE library in -src/CGALCore and include/CGAL/CORE. +src/CGAL_Core and include/CGAL/CORE. Core Library Version 1.7, August 2004 Copyright (c) 1995-2004 Exact Computation Project @@ -336,7 +336,7 @@ ImageIO ======= The following copyright statement applies to the ImageIO library in -src/CGALimageIO. +src/CGAL_ImageIO. Copyright (c) 2005, 2006 ASCLEPIOS Project, INRIA Sophia-Antipolis (France) All rights reserved. diff --git a/Maintenance/infrastructure/cgal.geometryfactory.com/crontab b/Maintenance/infrastructure/cgal.geometryfactory.com/crontab index 157299aa2a3..c5f6f825836 100644 --- a/Maintenance/infrastructure/cgal.geometryfactory.com/crontab +++ b/Maintenance/infrastructure/cgal.geometryfactory.com/crontab @@ -16,17 +16,12 @@ # Create internal release # The script also updates the manual tools. - -# SPECIAL TEST: test Script-improve_create_cmake-eric instead of next -#0 21 * * Tue,Wed,Thu,Fri cd $HOME/CGAL/create_internal_release && $HOME/bin/create_release $HOME/CGAL/branches/Script-improve_create_cmake-eric $HOME/CGAL/candidate-packages --public --do-it - - # "next" alone -0 21 * * Mon,Tue,Wed,Thu,Fri,Sat cd $HOME/CGAL/create_internal_release && $HOME/bin/create_release $HOME/CGAL/next --public --do-it +0 21 * * 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 -# - 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 +0 21 * * Sun,Mon,Tue,Wed,Thu cd $HOME/CGAL/create_internal_release && $HOME/bin/create_release $HOME/CGAL/next $HOME/CGAL/candidate-packages --public --do-it +# from branch 4.1 +0 21 * * Fri cd $HOME/CGAL/create_internal_release-4.1-branch && $HOME/bin/create_release $HOME/CGAL/CGAL-4.1-branch --public --do-it # Try to launch the test suite, every 10mn, from 21:00 to 22:50 @@ -49,6 +44,8 @@ #0 21 * * Fri cd $HOME/CGAL/create_internal_release-3.7-branch; $HOME/bin/create_release $HOME/CGAL/CGAL-3.7-branch --public --do-it # - from branch 3.9 #0 21 * * Sat cd $HOME/CGAL/create_internal_release-3.9-branch; $HOME/bin/create_release $HOME/CGAL/CGAL-3.9-branch --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 # - on trunk #0 21 * * Sat cd $HOME/CGAL/create_internal_release; $HOME/bin/create_release $HOME/CGAL/trunk --public --do-it diff --git a/Maintenance/infrastructure/renoir.geometryfactory.com/.autocgalrc b/Maintenance/infrastructure/renoir.geometryfactory.com/.autocgalrc index cde2451f5d8..2a5391c1764 100644 --- a/Maintenance/infrastructure/renoir.geometryfactory.com/.autocgalrc +++ b/Maintenance/infrastructure/renoir.geometryfactory.com/.autocgalrc @@ -17,7 +17,7 @@ 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.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" +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 x86-64_Linux-2.6_IntelCompiler-13.0beta-with-g++-4.6.3-STL_F16" BUILD_ON_localhost=all REFERENCE_PLATFORMS_DIR=$HOME/next/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms 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/CMakeCache.txt b/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 similarity index 85% rename from Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16/CMakeCache.txt rename to 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 index a3471c6d126..5fd5eab8fcb 100644 --- a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16/CMakeCache.txt +++ b/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 @@ -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.1-with-g++-4.6.3-STL_F16 +# 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 # 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,15 +26,6 @@ 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 @@ -44,11 +35,8 @@ 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.1-with-g++-4.6.3-STL_F16 +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 //Link with static Boost libraries CGAL_Boost_USE_STATIC_LIBS:BOOL=OFF @@ -57,13 +45,19 @@ 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 +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 //The CGAL_Core library -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 +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 //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-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; +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 //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 @@ -72,9 +66,6 @@ CGAL_Core_LIB_DEPENDS:STATIC=general;/usr/lib64/libmpfr.so;general;/usr/lib64/li // 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 @@ -88,7 +79,7 @@ CGAL_INSTALL_CMAKE_DIR:STRING=lib/CGAL //The folder where CGAL documentation and license files will be // installed, relative to CMAKE_INSTALL_PREFIX -CGAL_INSTALL_DOC_DIR:STRING=share/doc/CGAL-4.1-I-118 +CGAL_INSTALL_DOC_DIR:STRING=share/doc/CGAL-I-217 //The folder where CGAL header files will be installed, relative // to CMAKE_INSTALL_PREFIX @@ -102,39 +93,67 @@ 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.1-with-g++-4.6.3-STL_F16/lib/libCGAL_ImageIO.so +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 //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-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; +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 //The CGAL library -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 +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 //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; +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; //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.1-with-g++-4.6.3-STL_F16/lib/libCGAL_Qt3.so +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 //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-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; +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 //The CGAL_Qt4 library -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 +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 //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-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; +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 //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 @@ -142,10 +161,10 @@ CMAKE_BUILD_TYPE:STRING=Release CMAKE_COLOR_MAKEFILE:BOOL=ON //CXX compiler. -CMAKE_CXX_COMPILER:FILEPATH=/opt/intel/composer_xe_2011_sp1.10.319/bin/intel64/icpc +CMAKE_CXX_COMPILER:FILEPATH=/opt/intel/composerxe-2011.4.191/bin/intel64/icpc //User-defined flags -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 +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 //Flags used by the compiler during debug builds. CMAKE_CXX_FLAGS_DEBUG:STRING=-g @@ -162,7 +181,7 @@ CMAKE_CXX_FLAGS_RELEASE:STRING=-O3 CMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING=-O2 -g //C compiler. -CMAKE_C_COMPILER:FILEPATH=/opt/intel/composer_xe_2011_sp1.10.319/bin/intel64/icc +CMAKE_C_COMPILER:FILEPATH=/opt/intel/composerxe-2011.4.191/bin/intel64/icc //Flags used by the compiler during all build types. CMAKE_C_FLAGS:STRING= @@ -182,7 +201,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= @@ -209,7 +228,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= @@ -239,7 +258,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= @@ -253,12 +272,8 @@ 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 +CMAKE_SKIP_RPATH:BOOL=OFF //Path to a program. CMAKE_STRIP:FILEPATH=/usr/bin/strip @@ -270,7 +285,13 @@ 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=FALSE +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 //The directory containing the GMP header files GMP_INCLUDE_DIR:PATH=/usr/include @@ -609,7 +630,7 @@ 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. +//(This variable does not exist and should not be used) QT_QTCORE_INCLUDE_DIR:PATH=/usr/include/QtCore //The Qt QTCORE library @@ -889,7 +910,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=QT_QWEBVIEW_PLUGIN_RELEASE-NOTFOUND +QT_QWEBVIEW_PLUGIN_RELEASE:FILEPATH=/usr/lib64/qt4/plugins/designer/libqwebview.so //Path to a library. QT_QWSTSLIBMOUSEHANDLER_PLUGIN_DEBUG:FILEPATH=QT_QWSTSLIBMOUSEHANDLER_PLUGIN_DEBUG-NOTFOUND @@ -921,9 +942,6 @@ 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 @@ -936,60 +954,24 @@ 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 +//Use the GMP number types if available. WITH_GMP:BOOL=ON -//Select external library GMPXX -WITH_GMPXX:BOOL=OFF +//Search for GMPXX +WITH_GMPXX:BOOL=ON -//Select external library IPE -WITH_IPE:BOOL=OFF - -//Select external library LAPACK -WITH_LAPACK:BOOL=OFF - -//Select external library LEDA +//Use the LEDA number types if available. WITH_LEDA:BOOL=OFF -//Select external library MPFI +//Use MPFI if available. WITH_MPFI:BOOL=OFF -//Select external library MPFR -WITH_MPFR:BOOL=ON - -//Select external library NTL +//Use NTL if available. 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 +//Use RS if available. 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 @@ -1018,7 +1000,7 @@ X11_X11_LIB:FILEPATH=/usr/lib64/libX11.so X11_XRes_INCLUDE_PATH:PATH=/usr/include //Path to a library. -X11_XRes_LIB:FILEPATH=/usr/lib64/libXRes.so +X11_XRes_LIB:FILEPATH=X11_XRes_LIB-NOTFOUND //Path to a file. X11_XShm_INCLUDE_PATH:PATH=/usr/include @@ -1108,7 +1090,7 @@ X11_Xkb_INCLUDE_PATH:PATH=/usr/include X11_Xkbfile_INCLUDE_PATH:PATH=/usr/include //Path to a library. -X11_Xkbfile_LIB:FILEPATH=/usr/lib64/libxkbfile.so +X11_Xkbfile_LIB:FILEPATH=X11_Xkbfile_LIB-NOTFOUND //Path to a file. X11_Xkblib_INCLUDE_PATH:PATH=/usr/include @@ -1116,12 +1098,6 @@ 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 @@ -1167,9 +1143,6 @@ 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 @@ -1180,7 +1153,7 @@ X11_xf86misc_INCLUDE_PATH:PATH=/usr/include X11_xf86vmode_INCLUDE_PATH:PATH=/usr/include //Path to a program. -XIAR:FILEPATH=/opt/intel/composer_xe_2011_sp1.10.319/bin/intel64/xiar +XIAR:FILEPATH=/opt/intel/composerxe-2011.4.191/bin/intel64/xiar //Path to a file. ZLIB_INCLUDE_DIR:PATH=/usr/include @@ -1193,20 +1166,14 @@ 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 @@ -1218,10 +1185,9 @@ 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= +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 //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 @@ -1239,6 +1205,9 @@ 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 @@ -1248,15 +1217,81 @@ 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 @@ -1276,7 +1311,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.1-with-g++-4.6.3-STL_F16/lib/libCGAL.so +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 //Variable hidden from user CGAL_CGAL_LIBRARY_NAME:INTERNAL=libCGAL.so CGAL_CONFIGURED_LIBRARIES:INTERNAL=CGAL;Core;ImageIO;Qt3;Qt4 @@ -1288,47 +1323,7 @@ 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 @@ -1358,22 +1353,26 @@ 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 -//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: CGAL_SONAME_VERSION +CGAL_SONAME_VERSION-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CGAL_SOVERSION +CGAL_SOVERSION-ADVANCED:INTERNAL=1 //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.1-with-g++-4.6.3-STL_F16 +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 //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 +CMAKE_CACHE_PATCH_VERSION:INTERNAL=7 //ADVANCED property for variable: CMAKE_COLOR_MAKEFILE CMAKE_COLOR_MAKEFILE-ADVANCED:INTERNAL=1 //Path to CMake executable. @@ -1413,7 +1412,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/ccmake +CMAKE_EDIT_COMMAND:INTERNAL=/usr/bin/cmake-gui //Executable file format CMAKE_EXECUTABLE_FORMAT:INTERNAL=ELF //ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS @@ -1434,13 +1433,11 @@ 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 pthread.h +//Have include CMAKE_HAVE_PTHREAD_H CMAKE_HAVE_PTHREAD_H:INTERNAL=1 //Have function remove CMAKE_HAVE_REMOVE:INTERNAL=1 @@ -1489,31 +1486,28 @@ 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=-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 +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 //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] +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] //Details about finding ZLIB FIND_PACKAGE_MESSAGE_DETAILS_ZLIB:INTERNAL=[/usr/lib64/libz.so][/usr/include][v1.2.5()] //Result of TRY_COMPILE @@ -1525,7 +1519,7 @@ IntelCompiler_COMPILE_RES:INTERNAL=TRUE //Result of TRY_RUN IntelCompiler_RUN_RES:INTERNAL=0 //Variable hidden from user -LIBRARY_OUTPUT_PATH:INTERNAL= +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 //Result of TRY_COMPILE MPFR_COMPILE_RES:INTERNAL=TRUE //Result of TRY_RUN @@ -1977,6 +1971,18 @@ 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 @@ -2059,10 +2065,6 @@ 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 @@ -2093,8 +2095,6 @@ 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/setup b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/setup similarity index 62% rename from Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16/setup rename to Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/setup index 52c93877eb7..360b0f4a959 100644 --- a/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.1-with-g++-4.6.3-STL_F16/setup +++ b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16-strict-ansi/setup @@ -1,7 +1,7 @@ -source /opt/intel/composer_xe_2011_sp1/bin/compilervars.sh intel64 +source /opt/intel/composerxe-2011.4.191/bin/compilervars.sh intel64 CXX=icpc CC=icc -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" +CXXFLAGS="-D__SIZEOF_LONG__=8 -D__SIZEOF_LONG_LONG__=8 -strict-ansi" 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-12.1-with-g++-4.6.3-STL_F16-strict-ansi/CMakeCache.txt b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/CMakeCache.txt similarity index 87% rename from 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 rename to Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/CMakeCache.txt index c437fca0dca..beb8c651235 100644 --- 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/CMakeCache.txt +++ b/Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_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.1-with-g++-4.6.3-STL_F16-strict-ansi +# For build in directory: /home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_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,15 +26,6 @@ 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 @@ -44,11 +35,8 @@ 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.1-with-g++-4.6.3-STL_F16-strict-ansi +CGAL_BINARY_DIR:STATIC=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16 //Link with static Boost libraries CGAL_Boost_USE_STATIC_LIBS:BOOL=OFF @@ -57,13 +45,19 @@ 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 +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 //The CGAL_Core library -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 +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 //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-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; +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 //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 @@ -72,9 +66,6 @@ CGAL_Core_LIB_DEPENDS:STATIC=general;/usr/lib64/libmpfr.so;general;/usr/lib64/li // 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 @@ -88,7 +79,7 @@ CGAL_INSTALL_CMAKE_DIR:STRING=lib/CGAL //The folder where CGAL documentation and license files will be // installed, relative to CMAKE_INSTALL_PREFIX -CGAL_INSTALL_DOC_DIR:STRING=share/doc/CGAL-4.1-I-118 +CGAL_INSTALL_DOC_DIR:STRING=share/doc/CGAL-I-217 //The folder where CGAL header files will be installed, relative // to CMAKE_INSTALL_PREFIX @@ -102,39 +93,67 @@ 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.1-with-g++-4.6.3-STL_F16-strict-ansi/lib/libCGAL_ImageIO.so +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 //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-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; +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 //The CGAL library -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 +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 //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; +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; //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.1-with-g++-4.6.3-STL_F16-strict-ansi/lib/libCGAL_Qt3.so +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 //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-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; +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 //The CGAL_Qt4 library -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 +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 //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-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; +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 //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 @@ -142,10 +161,10 @@ CMAKE_BUILD_TYPE:STRING=Release CMAKE_COLOR_MAKEFILE:BOOL=ON //CXX compiler. -CMAKE_CXX_COMPILER:FILEPATH=/opt/intel/composer_xe_2011_sp1.10.319/bin/intel64/icpc +CMAKE_CXX_COMPILER:FILEPATH=/opt/intel/composerxe-2011.4.191/bin/intel64/icpc -//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 ' +//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 debug builds. CMAKE_CXX_FLAGS_DEBUG:STRING=-g @@ -162,7 +181,7 @@ CMAKE_CXX_FLAGS_RELEASE:STRING=-O3 CMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING=-O2 -g //C compiler. -CMAKE_C_COMPILER:FILEPATH=/opt/intel/composer_xe_2011_sp1.10.319/bin/intel64/icc +CMAKE_C_COMPILER:FILEPATH=/opt/intel/composerxe-2011.4.191/bin/intel64/icc //Flags used by the compiler during all build types. CMAKE_C_FLAGS:STRING= @@ -182,7 +201,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= @@ -209,7 +228,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= @@ -239,7 +258,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= @@ -253,12 +272,8 @@ 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 +CMAKE_SKIP_RPATH:BOOL=OFF //Path to a program. CMAKE_STRIP:FILEPATH=/usr/bin/strip @@ -270,7 +285,13 @@ 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=FALSE +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 //The directory containing the GMP header files GMP_INCLUDE_DIR:PATH=/usr/include @@ -609,7 +630,7 @@ 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. +//(This variable does not exist and should not be used) QT_QTCORE_INCLUDE_DIR:PATH=/usr/include/QtCore //The Qt QTCORE library @@ -889,7 +910,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=QT_QWEBVIEW_PLUGIN_RELEASE-NOTFOUND +QT_QWEBVIEW_PLUGIN_RELEASE:FILEPATH=/usr/lib64/qt4/plugins/designer/libqwebview.so //Path to a library. QT_QWSTSLIBMOUSEHANDLER_PLUGIN_DEBUG:FILEPATH=QT_QWSTSLIBMOUSEHANDLER_PLUGIN_DEBUG-NOTFOUND @@ -921,9 +942,6 @@ 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 @@ -936,60 +954,24 @@ 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 +//Use the GMP number types if available. WITH_GMP:BOOL=ON -//Select external library GMPXX -WITH_GMPXX:BOOL=OFF +//Search for GMPXX +WITH_GMPXX:BOOL=ON -//Select external library IPE -WITH_IPE:BOOL=OFF - -//Select external library LAPACK -WITH_LAPACK:BOOL=OFF - -//Select external library LEDA +//Use the LEDA number types if available. WITH_LEDA:BOOL=OFF -//Select external library MPFI +//Use MPFI if available. WITH_MPFI:BOOL=OFF -//Select external library MPFR -WITH_MPFR:BOOL=ON - -//Select external library NTL +//Use NTL if available. 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 +//Use RS if available. 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 @@ -1018,7 +1000,7 @@ X11_X11_LIB:FILEPATH=/usr/lib64/libX11.so X11_XRes_INCLUDE_PATH:PATH=/usr/include //Path to a library. -X11_XRes_LIB:FILEPATH=/usr/lib64/libXRes.so +X11_XRes_LIB:FILEPATH=X11_XRes_LIB-NOTFOUND //Path to a file. X11_XShm_INCLUDE_PATH:PATH=/usr/include @@ -1108,7 +1090,7 @@ X11_Xkb_INCLUDE_PATH:PATH=/usr/include X11_Xkbfile_INCLUDE_PATH:PATH=/usr/include //Path to a library. -X11_Xkbfile_LIB:FILEPATH=/usr/lib64/libxkbfile.so +X11_Xkbfile_LIB:FILEPATH=X11_Xkbfile_LIB-NOTFOUND //Path to a file. X11_Xkblib_INCLUDE_PATH:PATH=/usr/include @@ -1116,12 +1098,6 @@ 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 @@ -1167,9 +1143,6 @@ 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 @@ -1180,7 +1153,7 @@ X11_xf86misc_INCLUDE_PATH:PATH=/usr/include X11_xf86vmode_INCLUDE_PATH:PATH=/usr/include //Path to a program. -XIAR:FILEPATH=/opt/intel/composer_xe_2011_sp1.10.319/bin/intel64/xiar +XIAR:FILEPATH=/opt/intel/composerxe-2011.4.191/bin/intel64/xiar //Path to a file. ZLIB_INCLUDE_DIR:PATH=/usr/include @@ -1193,20 +1166,14 @@ 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 @@ -1218,10 +1185,9 @@ 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= +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 //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 @@ -1239,6 +1205,9 @@ 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 @@ -1248,15 +1217,81 @@ 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 @@ -1276,7 +1311,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.1-with-g++-4.6.3-STL_F16-strict-ansi/lib/libCGAL.so +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 //Variable hidden from user CGAL_CGAL_LIBRARY_NAME:INTERNAL=libCGAL.so CGAL_CONFIGURED_LIBRARIES:INTERNAL=CGAL;Core;ImageIO;Qt3;Qt4 @@ -1288,47 +1323,7 @@ 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 @@ -1358,22 +1353,26 @@ 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 -//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: CGAL_SONAME_VERSION +CGAL_SONAME_VERSION-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CGAL_SOVERSION +CGAL_SOVERSION-ADVANCED:INTERNAL=1 //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.1-with-g++-4.6.3-STL_F16-strict-ansi +CMAKE_CACHEFILE_DIR:INTERNAL=/home/lrineau/infrastructure/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_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 +CMAKE_CACHE_PATCH_VERSION:INTERNAL=7 //ADVANCED property for variable: CMAKE_COLOR_MAKEFILE CMAKE_COLOR_MAKEFILE-ADVANCED:INTERNAL=1 //Path to CMake executable. @@ -1413,7 +1412,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/ccmake +CMAKE_EDIT_COMMAND:INTERNAL=/usr/bin/cmake-gui //Executable file format CMAKE_EXECUTABLE_FORMAT:INTERNAL=ELF //ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS @@ -1434,13 +1433,11 @@ 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 pthread.h +//Have include CMAKE_HAVE_PTHREAD_H CMAKE_HAVE_PTHREAD_H:INTERNAL=1 //Have function remove CMAKE_HAVE_REMOVE:INTERNAL=1 @@ -1489,31 +1486,28 @@ 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='-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 ' +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 //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] +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] //Details about finding ZLIB FIND_PACKAGE_MESSAGE_DETAILS_ZLIB:INTERNAL=[/usr/lib64/libz.so][/usr/include][v1.2.5()] //Result of TRY_COMPILE @@ -1525,7 +1519,7 @@ IntelCompiler_COMPILE_RES:INTERNAL=TRUE //Result of TRY_RUN IntelCompiler_RUN_RES:INTERNAL=0 //Variable hidden from user -LIBRARY_OUTPUT_PATH:INTERNAL= +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 //Result of TRY_COMPILE MPFR_COMPILE_RES:INTERNAL=TRUE //Result of TRY_RUN @@ -1977,6 +1971,18 @@ 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 @@ -2059,10 +2065,6 @@ 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 @@ -2093,8 +2095,6 @@ 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.0-with-g++-4.6.2_F16/setup similarity index 61% rename from 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 rename to Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-2.6_IntelCompiler-12.0-with-g++-4.6.2_F16/setup index 663302d4881..65f588e8259 100644 --- 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.0-with-g++-4.6.2_F16/setup @@ -1,7 +1,7 @@ -source /opt/intel/composer_xe_2011_sp1/bin/compilervars.sh intel64 +source /opt/intel/composerxe-2011.4.191/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" +CXXFLAGS="-D__SIZEOF_LONG__=8 -D__SIZEOF_LONG_LONG__=8" export CXX CC CXXFLAGS export QTDIR=/usr/lib64/qt-3.3 source /home/lrineau/CGAL/MPFI-RS/setup-rs diff --git a/Maintenance/release_building/MINOR_NUMBER b/Maintenance/release_building/MINOR_NUMBER index d00491fd7e5..0cfbf08886f 100644 --- a/Maintenance/release_building/MINOR_NUMBER +++ b/Maintenance/release_building/MINOR_NUMBER @@ -1 +1 @@ -1 +2 diff --git a/Maintenance/release_building/public_release_name b/Maintenance/release_building/public_release_name deleted file mode 100644 index c8deeed6192..00000000000 --- a/Maintenance/release_building/public_release_name +++ /dev/null @@ -1 +0,0 @@ -CGAL-4.1-alpha1 diff --git a/Maintenance/svn_server/hooks/post-commit b/Maintenance/svn_server/hooks/post-commit index 2100b05cf6e..49d4e95851b 100755 --- a/Maintenance/svn_server/hooks/post-commit +++ b/Maintenance/svn_server/hooks/post-commit @@ -38,4 +38,12 @@ REV="$2" # Mail notification customized for CGAL /home/groups/cgal/hooks/cgal-commit-email.pl "$REPOS" "$REV" -h users.gforge.inria.fr cgal-commits@lists.gforge.inria.fr #/home/groups/cgal/hooks/cgal-commit-email.pl "$REPOS" "$REV" -h users.gforge.inria.fr Laurent.Rineau@geometryfactory.com +#/home/groups/cgal/hooks/cgal-commit-email.pl "$REPOS" "$REV" -h users.gforge.inria.fr sebastien.loriot@cgal.org +# Add that exit to workaround the fact that +# GForge adds lines automatically to post-commit +exit 0 + +#begin added by svncommitemail +/usr/lib/subversion/hook-scripts/commit-email.pl "$REPOS" "$REV" -h users.gforge.inria.fr cgal-commits@lists.gforge.inria.fr +#end added by svncommitemail diff --git a/Mesh_3/demo/Mesh_3/CMakeLists.txt b/Mesh_3/demo/Mesh_3/CMakeLists.txt index 4e03538a5ca..d3c870f24b8 100644 --- a/Mesh_3/demo/Mesh_3/CMakeLists.txt +++ b/Mesh_3/demo/Mesh_3/CMakeLists.txt @@ -118,7 +118,7 @@ if(CGAL_Qt4_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND) set(VIEWER_LIB "${MESH_3_LIB_PREFIX}viewer") add_library(${VIEWER_LIB} SHARED ${DEMO_SRC_DIR}/Viewer.cpp Viewer_moc.cpp) - target_link_libraries(${VIEWER_LIB} ${QGLVIEWER_LIBRARIES}) + target_link_libraries(${VIEWER_LIB} ${QGLVIEWER_LIBRARIES} ${QT_LIBRARIES} ${OPENGL_LIBRARIES}) set_target_properties(${VIEWER_LIB} PROPERTIES DEFINE_SYMBOL viewer_EXPORTS) set(SCENE_ITEM_LIB "${MESH_3_LIB_PREFIX}scene_item") @@ -128,6 +128,7 @@ if(CGAL_Qt4_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND) ${DEMO_SRC_DIR}/Scene_item_with_display_list.cpp ${DEMO_SRC_DIR}/Plugin_helper.cpp) set_target_properties(${SCENE_ITEM_LIB} PROPERTIES DEFINE_SYMBOL scene_item_EXPORTS) + target_link_libraries(${SCENE_ITEM_LIB} ${QT_LIBRARIES} ${OPENGL_LIBRARIES}) set(SCENE_SEGMENTED_IMAGE_ITEM_LIB "${MESH_3_LIB_PREFIX}scene_segmented_image_item") add_library(${SCENE_SEGMENTED_IMAGE_ITEM_LIB} SHARED @@ -154,13 +155,13 @@ if(CGAL_Qt4_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND) set(SCENE_C3T3_ITEM_LIB "${MESH_3_LIB_PREFIX}scene_c3t3_item") add_library(${SCENE_C3T3_ITEM_LIB} SHARED Scene_c3t3_item.cpp Scene_c3t3_item.moc) - target_link_libraries(${SCENE_C3T3_ITEM_LIB} ${SCENE_ITEM_LIB} ${QGLVIEWER_LIBRARIES} ) + target_link_libraries(${SCENE_C3T3_ITEM_LIB} ${SCENE_ITEM_LIB} ${QGLVIEWER_LIBRARIES} ${QT_LIBRARIES}) set_target_properties(${SCENE_C3T3_ITEM_LIB} PROPERTIES DEFINE_SYMBOL scene_c3t3_item_EXPORTS) set(SCENE_IMPLICIT_FUNCTION_ITEM_LIB "${MESH_3_LIB_PREFIX}scene_implicit_function_item") add_library(${SCENE_IMPLICIT_FUNCTION_ITEM_LIB} SHARED Scene_implicit_function_item.cpp Scene_implicit_function_item.moc Color_ramp.cpp) - target_link_libraries(${SCENE_IMPLICIT_FUNCTION_ITEM_LIB} ${SCENE_ITEM_LIB} ${QGLVIEWER_LIBRARIES} ) + target_link_libraries(${SCENE_IMPLICIT_FUNCTION_ITEM_LIB} ${SCENE_ITEM_LIB} ${QGLVIEWER_LIBRARIES} ${QT_LIBRARIES}) set_target_properties(${SCENE_IMPLICIT_FUNCTION_ITEM_LIB} PROPERTIES DEFINE_SYMBOL scene_implicit_function_item_EXPORTS) diff --git a/Mesh_3/include/CGAL/IO/File_medit.h b/Mesh_3/include/CGAL/IO/File_medit.h index 000b8c9b44d..b90a58cc176 100644 --- a/Mesh_3/include/CGAL/IO/File_medit.h +++ b/Mesh_3/include/CGAL/IO/File_medit.h @@ -345,7 +345,7 @@ class No_rebind_facet_pmap typedef unsigned int size_type; public: - No_rebind_facet_pmap(const C3T3& c3t3, const Cell_pmap& cell_pmap) + No_rebind_facet_pmap(const C3T3& c3t3, const Cell_pmap& /*cell_pmap*/) : r_c3t3_(c3t3) {} int surface_index(const Facet& f) const @@ -378,7 +378,7 @@ class No_rebind_facet_pmap_first typedef unsigned int size_type; public: - No_rebind_facet_pmap_first(const C3T3& c3t3, const Cell_pmap& cell_pmap) + No_rebind_facet_pmap_first(const C3T3& c3t3, const Cell_pmap& /*cell_pmap*/) : r_c3t3_(c3t3) {} int surface_index(const Facet& f) const @@ -412,7 +412,7 @@ class No_rebind_facet_pmap_second typedef unsigned int size_type; public: - No_rebind_facet_pmap_second(const C3T3& c3t3, const Cell_pmap& cell_pmap) + No_rebind_facet_pmap_second(const C3T3& c3t3, const Cell_pmap& /*cell_pmap*/) : r_c3t3_(c3t3) {} int surface_index(const Facet& f) const diff --git a/Mesh_3/include/CGAL/Mesh_cell_criteria_3.h b/Mesh_3/include/CGAL/Mesh_cell_criteria_3.h index 00bed529505..664d95e111e 100644 --- a/Mesh_3/include/CGAL/Mesh_cell_criteria_3.h +++ b/Mesh_3/include/CGAL/Mesh_cell_criteria_3.h @@ -66,7 +66,7 @@ public: template Mesh_cell_criteria_3(const FT& radius_edge_bound, const Sizing_field& radius_bound, - typename Sizing_field::FT dummy = 0) + typename Sizing_field::FT /*dummy*/ = 0) { init_radius(radius_bound); diff --git a/Mesh_3/include/CGAL/Mesh_edge_criteria_3.h b/Mesh_3/include/CGAL/Mesh_edge_criteria_3.h index 552c10da6d3..13311ef2fd2 100644 --- a/Mesh_3/include/CGAL/Mesh_edge_criteria_3.h +++ b/Mesh_3/include/CGAL/Mesh_edge_criteria_3.h @@ -112,7 +112,7 @@ public: // as int. template < typename Sizing_field > Mesh_edge_criteria_3(const Sizing_field& size, - typename Sizing_field::FT dummy = 0 ) + typename Sizing_field::FT /*dummy*/ = 0 ) { CGAL_static_assertion((boost::is_same::value)); diff --git a/Mesh_3/include/CGAL/Mesh_facet_criteria_3.h b/Mesh_3/include/CGAL/Mesh_facet_criteria_3.h index eb7762c2ebc..69057089f10 100644 --- a/Mesh_3/include/CGAL/Mesh_facet_criteria_3.h +++ b/Mesh_3/include/CGAL/Mesh_facet_criteria_3.h @@ -79,7 +79,7 @@ public: const FT& distance_bound, const Mesh_facet_topology topology = FACET_VERTICES_ON_SURFACE, - typename Sizing_field::FT dummy = 0) + typename Sizing_field::FT /*dummy*/ = 0) { if ( FT(0) != angle_bound ) init_aspect(angle_bound); diff --git a/Mesh_3/include/CGAL/make_mesh_3.h b/Mesh_3/include/CGAL/make_mesh_3.h index 3efa1ff1dc1..2583f69ee82 100644 --- a/Mesh_3/include/CGAL/make_mesh_3.h +++ b/Mesh_3/include/CGAL/make_mesh_3.h @@ -101,7 +101,7 @@ namespace parameters { template < typename MeshDomain > inline internal::Features_options - features(const MeshDomain& domain) + features(const MeshDomain& /*domain*/) { typedef typename internal::Domain_features_generator< MeshDomain, diff --git a/Min_sphere_of_spheres_d/include/CGAL/Min_sphere_of_spheres_d/Min_sphere_of_spheres_d_impl.h b/Min_sphere_of_spheres_d/include/CGAL/Min_sphere_of_spheres_d/Min_sphere_of_spheres_d_impl.h index 3c289e52bfb..39fb971bce9 100644 --- a/Min_sphere_of_spheres_d/include/CGAL/Min_sphere_of_spheres_d/Min_sphere_of_spheres_d_impl.h +++ b/Min_sphere_of_spheres_d/include/CGAL/Min_sphere_of_spheres_d/Min_sphere_of_spheres_d_impl.h @@ -64,7 +64,7 @@ namespace CGAL_MINIBALL_NAMESPACE { template void Min_sphere_of_spheres_d::update(LP_algorithm) { using namespace Min_sphere_of_spheres_d_impl; - const int n = l.size(); + const int n = (int)l.size(); int i, k = n; do { CGAL_MINIBALL_ASSERT(k>=e && e>=0); @@ -224,7 +224,7 @@ namespace CGAL_MINIBALL_NAMESPACE { template void Min_sphere_of_spheres_d::update(Farthest_first_heuristic) { - const int n = l.size(); + const int n = (int)l.size(); int i = e; CGAL_MINIBALL_ASSERT(e <= n); diff --git a/Modular_arithmetic/include/CGAL/Modular_arithmetic/Residue_type.h b/Modular_arithmetic/include/CGAL/Modular_arithmetic/Residue_type.h index e615d1efbdc..0f6228347f3 100644 --- a/Modular_arithmetic/include/CGAL/Modular_arithmetic/Residue_type.h +++ b/Modular_arithmetic/include/CGAL/Modular_arithmetic/Residue_type.h @@ -228,7 +228,7 @@ public: //! constructor of Residue, from long Residue(long n){ - x_= RES_reduce(n); + x_= RES_reduce((double)n); } //! Access operator for x, \c const diff --git a/Nef_2/include/CGAL/Bounded_kernel.h b/Nef_2/include/CGAL/Bounded_kernel.h index 7e67db4651e..cc7072ad429 100644 --- a/Nef_2/include/CGAL/Bounded_kernel.h +++ b/Nef_2/include/CGAL/Bounded_kernel.h @@ -105,8 +105,8 @@ public: SECORNER, RIGHTFRAME, NECORNER }; /*{\Xenum a type descriptor for extended points.}*/ - Point_2 epoint(const Standard_FT& m1, const Standard_FT& n1, - const Standard_FT& m2, const Standard_FT& n2) const + Point_2 epoint(const Standard_FT& /*m1*/, const Standard_FT& /*n1*/, + const Standard_FT& /*m2*/, const Standard_FT& /*n2*/) const { CGAL_error_msg( "Bounded_kernel::epoint(..) should not be called"); return Point_2(); @@ -130,7 +130,7 @@ public: Point_2 construct_point(const Standard_point_2& , const Standard_point_2& , - Point_type& t) const + Point_type& /*t*/) const { CGAL_error_msg( "Bounded_kernel::construct_point(Point,Point) should not be called"); return Point_2(); @@ -159,21 +159,21 @@ public: } Point_2 - construct_opposite_point(const Standard_line_2& l) const + construct_opposite_point(const Standard_line_2& /*l*/) const { CGAL_error_msg( "Bounded_kernel::construct_opposite_point(..) should not be called"); return Point_2(); } Point_type - type(const Point_2& p) const + type(const Point_2& /*p*/) const { return STANDARD; } bool - is_standard(const Point_2& p) const + is_standard(const Point_2& /*p*/) const { return true; } @@ -185,14 +185,14 @@ public: } Standard_line_2 - standard_line(const Point_2& p) const + standard_line(const Point_2& /*p*/) const { CGAL_error_msg( "Bounded_kernel::standard_line(..) should not be called"); return Standard_line_2(); } Standard_ray_2 - standard_ray(const Point_2& p) const + standard_ray(const Point_2& /*p*/) const { CGAL_error_msg( "Bounded_kernel::standard_ray(..) should not be called"); return Standard_ray_2(); diff --git a/Nef_2/include/CGAL/Nef_polyhedron_2.h b/Nef_2/include/CGAL/Nef_polyhedron_2.h index 95a13105f9b..8bfda72d577 100644 --- a/Nef_2/include/CGAL/Nef_polyhedron_2.h +++ b/Nef_2/include/CGAL/Nef_polyhedron_2.h @@ -234,7 +234,7 @@ protected: } bool - operator()(Halfedge_handle e, const Tag_false& ) const + operator()(Halfedge_handle /*e*/, const Tag_false& ) const { return false; } diff --git a/Nef_3/include/CGAL/Nef_3/ID_support_handler.h b/Nef_3/include/CGAL/Nef_3/ID_support_handler.h index 975f2fb3889..7e3e458cdf1 100644 --- a/Nef_3/include/CGAL/Nef_3/ID_support_handler.h +++ b/Nef_3/include/CGAL/Nef_3/ID_support_handler.h @@ -46,7 +46,7 @@ class ID_support_handler { int get_hash(int) { return 0; } template void initialize_hash(Handle /*h*/) {} - void initialize_hash(int i) {} + void initialize_hash(int /*i*/) {} void handle_support(SVertex_handle , SHalfedge_const_handle , SHalfedge_const_handle ) {} diff --git a/Nef_3/include/CGAL/Nef_3/Infimaximal_box.h b/Nef_3/include/CGAL/Nef_3/Infimaximal_box.h index 86fee171ad8..43d703b6f92 100644 --- a/Nef_3/include/CGAL/Nef_3/Infimaximal_box.h +++ b/Nef_3/include/CGAL/Nef_3/Infimaximal_box.h @@ -139,7 +139,9 @@ class Infimaximal_box { return NT(1); } - static void compute_min_max(const Plane_3& , NT orth_coords[3], int& /* min */, int& /* max */) { } + static void compute_min_max(const Plane_3& , NT orth_coords[3], int& /* min */, int& /* max */) { + (void)orth_coords; + } static Point_3 scale_infibox_vertex(const Point_3& ) { return Point_3(); @@ -163,7 +165,7 @@ class Infimaximal_box { return std::list(); } - static typename std::list::const_iterator segment_on_side(int side_of_point, + static typename std::list::const_iterator segment_on_side(int /*side_of_point*/, const std::list& segs) { return segs.begin(); } diff --git a/Nef_3/include/CGAL/Nef_3/OGL_helper.h b/Nef_3/include/CGAL/Nef_3/OGL_helper.h index 49318e44b05..30f375f5294 100644 --- a/Nef_3/include/CGAL/Nef_3/OGL_helper.h +++ b/Nef_3/include/CGAL/Nef_3/OGL_helper.h @@ -178,10 +178,10 @@ namespace OGL { { return static_cast(normal_); } void new_facet_cycle() - { fc_ends_.push_back(coords_.size()); } + { fc_ends_.push_back((unsigned)coords_.size()); } unsigned number_of_facet_cycles() const - { return fc_ends_.size(); } + { return (unsigned)fc_ends_.size(); } Coord_iterator facet_cycle_begin(unsigned i) { CGAL_assertion(i - void set_index(Handle h, Edge e) {} + void set_index(Handle /*h*/, Edge /*e*/) {} }; template diff --git a/Nef_3/include/CGAL/Nef_polyhedron_3.h b/Nef_3/include/CGAL/Nef_polyhedron_3.h index 7644f202392..d1e3d2eda18 100644 --- a/Nef_3/include/CGAL/Nef_polyhedron_3.h +++ b/Nef_3/include/CGAL/Nef_polyhedron_3.h @@ -1839,7 +1839,7 @@ protected: /*{\Moperations 3 1 }*/ - bool contains(Object_handle h) const + bool contains(Object_handle /*h*/) const /*{\Mop returns true iff the object |h| is contained in the set represented by |\Mvar|.}*/ // { SNC_point_locator PL(snc()); return PL.mark(h);} diff --git a/Nef_3/test/Nef_3/nef_union_error_llvm.cpp b/Nef_3/test/Nef_3/nef_union_error_llvm.cpp index 5d828e3e4a1..bca9fec0243 100644 --- a/Nef_3/test/Nef_3/nef_union_error_llvm.cpp +++ b/Nef_3/test/Nef_3/nef_union_error_llvm.cpp @@ -13,7 +13,7 @@ typedef CGAL::Nef_polyhedron_3 Nef_polyhedron; typedef Kernel::Vector_3 Vector_3; typedef Kernel::Aff_transformation_3 Aff_transformation_3; -int main(int argc, char** argv) { +int main(int, char**) { Polyhedron P1; Polyhedron P2; Polyhedron P3; @@ -37,4 +37,4 @@ int main(int argc, char** argv) { N1.closure().convert_to_polyhedron(P3); return 0; -} \ No newline at end of file +} diff --git a/Nef_S2/include/CGAL/Nef_S2/SM_overlayer.h b/Nef_S2/include/CGAL/Nef_S2/SM_overlayer.h index f4277148e8b..021c8b0d4d9 100644 --- a/Nef_S2/include/CGAL/Nef_S2/SM_overlayer.h +++ b/Nef_S2/include/CGAL/Nef_S2/SM_overlayer.h @@ -336,12 +336,12 @@ void link_as_target_and_append(SVertex_handle v, SHalfedge_handle e) SHalfedge_handle new_halfedge_pair_at_source(SVertex_handle v) { return G.new_shalfedge_pair_at_source(v,Graph::BEFORE); } -void supporting_segment(SHalfedge_handle e, ITERATOR it) {} -void halfedge_below(SVertex_handle v, SHalfedge_handle e) {} -void trivial_segment(SVertex_handle v, ITERATOR it) {} -void starting_segment(SVertex_handle v, ITERATOR it) {} -void passing_segment(SVertex_handle v, ITERATOR it) {} -void ending_segment(SVertex_handle v, ITERATOR it) {} +void supporting_segment(SHalfedge_handle /*e*/, ITERATOR /*it*/) {} +void halfedge_below(SVertex_handle /*v*/, SHalfedge_handle /*e*/) {} +void trivial_segment(SVertex_handle /*v*/, ITERATOR /*it*/) {} +void starting_segment(SVertex_handle /*v*/, ITERATOR /*it*/) {} +void passing_segment(SVertex_handle /*v*/, ITERATOR /*it*/) {} +void ending_segment(SVertex_handle /*v*/, ITERATOR /*it*/) {} }; // SMO_decorator diff --git a/Nef_S2/src/CGALQt3/Nef_S2.qtmoc.cmake b/Nef_S2/src/CGAL_Qt3/Nef_S2.qtmoc.cmake similarity index 100% rename from Nef_S2/src/CGALQt3/Nef_S2.qtmoc.cmake rename to Nef_S2/src/CGAL_Qt3/Nef_S2.qtmoc.cmake diff --git a/Nef_S2/src/CGALQt3/Qt_widget_OpenGL.cpp b/Nef_S2/src/CGAL_Qt3/Qt_widget_OpenGL.cpp similarity index 100% rename from Nef_S2/src/CGALQt3/Qt_widget_OpenGL.cpp rename to Nef_S2/src/CGAL_Qt3/Qt_widget_OpenGL.cpp diff --git a/Number_types/include/CGAL/GMP/Gmpfr_type.h b/Number_types/include/CGAL/GMP/Gmpfr_type.h index a1449d20fc9..ed5e56aaf72 100644 --- a/Number_types/include/CGAL/GMP/Gmpfr_type.h +++ b/Number_types/include/CGAL/GMP/Gmpfr_type.h @@ -1082,6 +1082,11 @@ std::istream& operator>>(std::istream& is,Gmpfr &f){ mant=10*mant+(c-'0'); c=is.get(); } + + // set the correct sign of the mantissa + if(neg_mant) + mant=-mant; + is.putback(c); gmpz_eat_white_space(is); diff --git a/Number_types/test/Number_types/Gmpfr.cpp b/Number_types/test/Number_types/Gmpfr.cpp index e1c1b5d0f96..c66fe477364 100644 --- a/Number_types/test/Number_types/Gmpfr.cpp +++ b/Number_types/test/Number_types/Gmpfr.cpp @@ -207,7 +207,8 @@ int main(){ CGAL::Gmpzf f; mpfr_set_inf(plus_infinity.fr(),1); mpfr_set_inf(minus_infinity.fr(),-1); - _TEST("I/O int",(CGAL::test_io(2145338339));) + _TEST("I/O positive int",(CGAL::test_io(2145338339));) + _TEST("I/O negative int",(CGAL::test_io(-25295236));) _TEST("I/O double",(CGAL::test_io(.2147483647));) _TEST("I/O +inf",(CGAL::test_io(plus_infinity));) _TEST("I/O -inf",(CGAL::test_io(minus_infinity));) diff --git a/Number_types/test/Number_types/Gmpfr_bug.cpp b/Number_types/test/Number_types/Gmpfr_bug.cpp index 0fa3a27f053..8b7d320327d 100644 --- a/Number_types/test/Number_types/Gmpfr_bug.cpp +++ b/Number_types/test/Number_types/Gmpfr_bug.cpp @@ -18,6 +18,7 @@ #ifdef CGAL_USE_MPFI +#include // for the assert macro #include #include #include diff --git a/OpenNL/include/CGAL/OpenNL/blas.h b/OpenNL/include/CGAL/OpenNL/blas.h index ced9e2b9ceb..b5aa3722848 100644 --- a/OpenNL/include/CGAL/OpenNL/blas.h +++ b/OpenNL/include/CGAL/OpenNL/blas.h @@ -47,22 +47,22 @@ public: typedef typename VECTOR::CoeffType CoeffType ; /** y <- y + a*x */ - static void axpy(CoeffType a, const VectorType& x, VectorType& y) { + static void axpy(CoeffType /*a*/, const VectorType& /*x*/, VectorType& /*y*/) { CGAL_error(); } /** x <- a*x */ - static void scal(CoeffType a, VectorType& x) { + static void scal(CoeffType /*a*/, VectorType& /*x*/) { CGAL_error(); } /** y <- x */ - static void copy(const VectorType& x, VectorType& y) { + static void copy(const VectorType& /*x*/, VectorType& /*y*/) { CGAL_error(); } /** returns x^t * y */ - static CoeffType dot(const VectorType& x, const VectorType& y) { + static CoeffType dot(const VectorType& /*x*/, const VectorType& /*y*/) { CGAL_error(); } } ; 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 4d9b1720a0f..a9af1f4fff5 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 @@ -817,8 +817,8 @@ private: Point_hider &hider, Vertex_handle vh = Vertex_handle()); template - void periodic_sort(Point_iterator p_begin, Point_iterator p_end, - Offset_iterator o_begin, Offset_iterator o_end) const { + void periodic_sort(Point_iterator /*p_begin*/, Point_iterator /*p_end*/, + Offset_iterator /*o_begin*/, Offset_iterator /*o_end*/) const { std::cout << "Periodic_sort not yet implemented" << std::endl; } diff --git a/Point_set_processing_3/include/CGAL/IO/write_off_points.h b/Point_set_processing_3/include/CGAL/IO/write_off_points.h index b2909e089e8..ce4b467f888 100644 --- a/Point_set_processing_3/include/CGAL/IO/write_off_points.h +++ b/Point_set_processing_3/include/CGAL/IO/write_off_points.h @@ -81,7 +81,7 @@ write_off_points_and_normals( } // Write header - const int num_input_points = std::distance(first, beyond); + const std::size_t num_input_points = std::distance(first, beyond); stream << "NOFF" << std::endl; stream << num_input_points << " 0 0" << std::endl; @@ -180,7 +180,7 @@ write_off_points( } // Write header - const int num_input_points = std::distance(first, beyond); + const std::size_t num_input_points = std::distance(first, beyond); stream << "OFF" << std::endl; stream << num_input_points << " 0 0" << std::endl; diff --git a/Point_set_processing_3/include/CGAL/Index_property_map.h b/Point_set_processing_3/include/CGAL/Index_property_map.h index 9dc31a2ed3b..b3a2da90054 100644 --- a/Point_set_processing_3/include/CGAL/Index_property_map.h +++ b/Point_set_processing_3/include/CGAL/Index_property_map.h @@ -126,7 +126,7 @@ class Index_property_map #include #include +#include #include #include @@ -53,7 +54,7 @@ namespace internal { /// Generalization of std::distance() to compute the distance between 2 integers -inline int +inline std::size_t distance(std::size_t _First, std::size_t _Last) { // return int difference @@ -296,7 +297,7 @@ create_riemannian_graph( CGAL_point_set_processing_precondition(k >= 2); // Number of input points - const int num_input_points = distance(first, beyond); + const std::size_t num_input_points = distance(first, beyond); long memory = CGAL::Memory_sizer().virtual_size(); CGAL_TRACE(" %ld Mb allocated\n", memory>>20); CGAL_TRACE(" Creates KD-tree\n"); @@ -338,7 +339,7 @@ create_riemannian_graph( Riemannian_graph_weight_map riemannian_graph_weight_map = get(boost::edge_weight, riemannian_graph); for (ForwardIterator it = first; it != beyond; it++) { - unsigned int it_index = get(index_pmap,it); + std::size_t it_index = get(index_pmap,it); Vector it_normal_vector = get(normal_pmap,it); // Gather set of (k+1) neighboring points. @@ -349,13 +350,13 @@ create_riemannian_graph( Point_vertex_handle_3 point_wrapper(point.x(), point.y(), point.z(), it); Neighbor_search search(*tree, point_wrapper, k+1); Search_iterator search_iterator = search.begin(); - for(unsigned int i=0;i<(k+1);i++) + for(std::size_t i=0;i<(k+1);i++) { if(search_iterator == search.end()) break; // premature ending ForwardIterator neighbor = search_iterator->first; - unsigned int neighbor_index = get(index_pmap,neighbor); + std::size_t neighbor_index = get(index_pmap,neighbor); if (neighbor_index > it_index) // undirected graph { // Add edge @@ -417,6 +418,11 @@ create_mst_graph( const Riemannian_graph& riemannian_graph, ///< graph connecting each vertex to its knn ForwardIterator source_point) ///< source point (with an oriented normal) { + // prevents warnings + CGAL_USE(point_pmap); + CGAL_USE(k); + CGAL_USE(kernel); + // Bring private stuff to scope using namespace internal; @@ -431,13 +437,13 @@ create_mst_graph( CGAL_point_set_processing_precondition(first != beyond); // Number of input points - const int num_input_points = boost::num_vertices(riemannian_graph); + const std::size_t num_input_points = boost::num_vertices(riemannian_graph); long memory = CGAL::Memory_sizer().virtual_size(); CGAL_TRACE(" %ld Mb allocated\n", memory>>20); CGAL_TRACE(" Calls boost::prim_minimum_spanning_tree()\n"); // Computes Minimum Spanning Tree. - unsigned int source_point_index = get(index_pmap, source_point); + std::size_t source_point_index = get(index_pmap, source_point); Riemannian_graph_weight_map riemannian_graph_weight_map = get(boost::edge_weight, riemannian_graph); typedef std::vector PredecessorMap; PredecessorMap predecessor(num_input_points); @@ -463,7 +469,7 @@ create_mst_graph( mst_graph[v].is_oriented = (it == source_point); } // add edges - for (unsigned int i=0; i < predecessor.size(); i++) // add edges + for (std::size_t i=0; i < predecessor.size(); i++) // add edges { if (i != predecessor[i]) { @@ -586,7 +592,7 @@ mst_orient_normals( // Traverse the point set along the MST to propagate source_point's orientation Propagate_normal_orientation orienter; - unsigned int source_point_index = get(index_pmap, source_point); + std::size_t source_point_index = get(index_pmap, source_point); boost::breadth_first_search(mst_graph, boost::vertex(source_point_index, mst_graph), // source visitor(boost::make_bfs_visitor(orienter))); @@ -595,7 +601,7 @@ mst_orient_normals( std::deque oriented_points, unoriented_points; for (ForwardIterator it = first; it != beyond; it++) { - unsigned int it_index = get(index_pmap,it); + std::size_t it_index = get(index_pmap,it); typename MST_graph::vertex_descriptor v = boost::vertex(it_index, mst_graph); if (mst_graph[v].is_oriented) oriented_points.push_back(*it); diff --git a/Point_set_processing_3/include/CGAL/random_simplify_point_set.h b/Point_set_processing_3/include/CGAL/random_simplify_point_set.h index b821bceb2e1..cf996bdfb9d 100644 --- a/Point_set_processing_3/include/CGAL/random_simplify_point_set.h +++ b/Point_set_processing_3/include/CGAL/random_simplify_point_set.h @@ -65,8 +65,8 @@ random_simplify_point_set( std::random_shuffle (first, beyond); // Computes first iterator to remove - int nb_points = std::distance(first, beyond); - int first_index_to_remove = int(double(nb_points) * ((100.0-removed_percentage)/100.0)); + std::size_t nb_points = std::distance(first, beyond); + std::size_t first_index_to_remove = (std::size_t)(double(nb_points) * ((100.0-removed_percentage)/100.0)); ForwardIterator first_point_to_remove = first; std::advance(first_point_to_remove, first_index_to_remove); diff --git a/Polyhedron/demo/Polyhedron/CMakeLists.txt b/Polyhedron/demo/Polyhedron/CMakeLists.txt index a9f9344c5a4..789664fafc7 100644 --- a/Polyhedron/demo/Polyhedron/CMakeLists.txt +++ b/Polyhedron/demo/Polyhedron/CMakeLists.txt @@ -82,7 +82,8 @@ endif() if(CGAL_Qt4_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND) - find_package(Boost) + set(Boost_USE_MULTITHREADED ON) + find_package(Boost COMPONENTS thread system) include_directories ( ${QGLVIEWER_INCLUDE_DIR} ) @@ -126,8 +127,7 @@ if(CGAL_Qt4_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND) Scene_c2t3_item.cpp Scene_nef_polyhedron_item.cpp Show_point_dialog.cpp - Scene_points_with_normal_item.cpp - ) + Scene_points_with_normal_item.cpp) # AUXILIARY LIBRARIES @@ -144,6 +144,7 @@ if(CGAL_Qt4_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND) target_link_libraries(demo_framework ${QGLVIEWER_LIBRARIES} + ${QT_LIBRARIES} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ) @@ -152,55 +153,47 @@ if(CGAL_Qt4_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND) Scene_plane_item.cpp Scene_plane_item.moc) target_link_libraries(scene_basic_objects demo_framework + ${CGAL_LIBRARIES} ${QGLVIEWER_LIBRARIES} + ${QT_LIBRARIES} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ) - add_library(point_dialog SHARED Show_point_dialog.cpp Show_point_dialog.ui ${Show_point_dialogUI_FILES} ) + add_library(point_dialog SHARED Show_point_dialog.cpp Show_point_dialog.ui ${Show_point_dialogUI_FILES}) + target_link_libraries(point_dialog ${QT_LIBRARIES}) - add_library(scene_c2t3_item SHARED - Scene_c2t3_item.cpp Scene_c2t3_item.moc) - target_link_libraries(scene_c2t3_item demo_framework) + macro(add_item item_name) + add_library(${item_name} SHARED ${ARGN}) + target_link_libraries(${item_name} demo_framework ${QT_LIBRARIES} ${CGAL_LIBRARIES} ${Boost_LIBRARIES}) + endmacro(add_item) - add_library(scene_polyhedron_item SHARED - Scene_polyhedron_item.cpp Scene_polyhedron_item.moc) - target_link_libraries(scene_polyhedron_item demo_framework) + add_item(scene_c2t3_item Scene_c2t3_item.cpp Scene_c2t3_item.moc) + add_item(scene_polyhedron_item Scene_polyhedron_item.cpp Scene_polyhedron_item.moc) + add_item(scene_polyhedron_transform_item Scene_polyhedron_transform_item.cpp Scene_polyhedron_transform_item.moc) + # special + target_link_libraries(scene_polyhedron_transform_item scene_polyhedron_item) - 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_item(scene_combinatorial_map_item Scene_combinatorial_map_item.cpp Scene_combinatorial_map_item.moc) + # special + target_link_libraries(scene_combinatorial_map_item 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) + add_item(scene_polylines_item Scene_polylines_item.cpp Scene_polylines_item.moc) - add_library(scene_polylines_item SHARED - Scene_polylines_item.cpp Scene_polylines_item.moc) - target_link_libraries(scene_polylines_item demo_framework) - - add_library(scene_edit_polyhedron_item SHARED - Scene_edit_polyhedron_item.cpp Scene_edit_polyhedron_item.moc) - target_link_libraries(scene_edit_polyhedron_item scene_polyhedron_item demo_framework) + add_item(scene_edit_polyhedron_item Scene_edit_polyhedron_item.cpp Scene_edit_polyhedron_item.moc) + # special + target_link_libraries(scene_edit_polyhedron_item scene_polyhedron_item) if(EIGEN3_FOUND OR TAUCS_FOUND) - add_library(scene_textured_polyhedron_item SHARED - Scene_textured_polyhedron_item.cpp texture.cpp Scene_textured_polyhedron_item.moc) - target_link_libraries(scene_textured_polyhedron_item demo_framework) + add_item(scene_textured_polyhedron_item Scene_textured_polyhedron_item.cpp texture.cpp Scene_textured_polyhedron_item.moc) endif(EIGEN3_FOUND OR TAUCS_FOUND) - add_library(scene_polygon_soup_item SHARED - Scene_polygon_soup_item.cpp Scene_polygon_soup_item.moc) - target_link_libraries(scene_polygon_soup_item demo_framework scene_polyhedron_item) - - add_library(scene_nef_polyhedron_item SHARED - Scene_nef_polyhedron_item.cpp Scene_nef_polyhedron_item.moc + add_item(scene_polygon_soup_item Scene_polygon_soup_item.cpp Scene_polygon_soup_item.moc) + target_link_libraries(scene_polygon_soup_item scene_polyhedron_item) + add_item(scene_nef_polyhedron_item Scene_nef_polyhedron_item.cpp Scene_nef_polyhedron_item.moc Scene_nef_rendering.cpp) - target_link_libraries(scene_nef_polyhedron_item demo_framework scene_polyhedron_item) - - add_library(scene_points_with_normal_item SHARED - Scene_points_with_normal_item.cpp Scene_points_with_normal_item.moc) - target_link_libraries(scene_points_with_normal_item demo_framework) + target_link_libraries(scene_nef_polyhedron_item scene_polyhedron_item) + add_item(scene_points_with_normal_item Scene_points_with_normal_item.cpp Scene_points_with_normal_item.moc) foreach( lib demo_framework diff --git a/Polyhedron/demo/Polyhedron/Polyhedron_demo_cut_plugin.cpp b/Polyhedron/demo/Polyhedron/Polyhedron_demo_cut_plugin.cpp index a343556bde7..0a163e30ed7 100644 --- a/Polyhedron/demo/Polyhedron/Polyhedron_demo_cut_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Polyhedron_demo_cut_plugin.cpp @@ -233,7 +233,7 @@ void Polyhedron_demo_cut_plugin::createCutPlane() { // Hide polyhedrons and call cut() (avoid that nothing shows up until user // decides to move the plane item) - for(size_t i = 0, end = scene->numberOfEntries(); i < end; ++i) { + for(int i = 0, end = scene->numberOfEntries(); i < end; ++i) { Scene_item* item = scene->item(i); Scene_polyhedron_item* poly_item = qobject_cast(item); if ( NULL != poly_item ) @@ -261,7 +261,7 @@ void Polyhedron_demo_cut_plugin::cut() { edges_item->edges.clear(); QTime time; time.start(); - for(size_t i = 0, end = scene->numberOfEntries(); i < end; ++i) { + for(int i = 0, end = scene->numberOfEntries(); i < end; ++i) { Scene_item* item = scene->item(i); Scene_polyhedron_item* poly_item = qobject_cast(item); if(!poly_item) continue; 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 b3449906d74..a8ef8ac0050 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 @@ -40,7 +40,7 @@ typedef Tr::Point Point_3; namespace { void CGALglcolor(QColor c) { - ::glColor4f(c.red()/255.0, c.green()/255.0, c.blue()/255.0, c.alpha()/255.0); + ::glColor4d(c.red()/255.0, c.green()/255.0, c.blue()/255.0, c.alpha()/255.0); } } @@ -318,9 +318,9 @@ Scene_item* cgal_code_mesh_3(const Polyhedron* pMesh, std::ofstream medit_out("out.mesh"); new_item->c3t3().output_to_medit(medit_out); const Scene_item::Bbox& bbox = new_item->bbox(); - new_item->setPosition((bbox.xmin + bbox.xmax)/2.f, - (bbox.ymin + bbox.ymax)/2.f, - (bbox.zmin + bbox.zmax)/2.f); + new_item->setPosition((float)(bbox.xmin + bbox.xmax)/2.f, + (float)(bbox.ymin + bbox.ymax)/2.f, + (float)(bbox.zmin + bbox.zmax)/2.f); return new_item; } else { diff --git a/Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_simplification_plugin.cpp b/Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_simplification_plugin.cpp index 5dce477e069..bdad534c43c 100644 --- a/Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_simplification_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_simplification_plugin.cpp @@ -47,12 +47,12 @@ void Polyhedron_demo_mesh_simplification_plugin::on_actionSimplify_triggered() // get option (#edges) bool ok; - const unsigned int nb_edges = + const int nb_edges = QInputDialog::getInteger(mw, tr("Stop condition"), tr("Number of edges:"), - pMesh->size_of_halfedges () / 4, // default value: current #edges / 2 + (int)(pMesh->size_of_halfedges () / 4), // default value: current #edges / 2 3, // min = one triangle - pMesh->size_of_halfedges(), // max #edges + (int)pMesh->size_of_halfedges(), // max #edges 1, // step for the spinbox &ok); diff --git a/Polyhedron/demo/Polyhedron/Polyhedron_demo_normal_estimation_plugin.cpp b/Polyhedron/demo/Polyhedron/Polyhedron_demo_normal_estimation_plugin.cpp index 27c8743c507..d8a92b81fea 100644 --- a/Polyhedron/demo/Polyhedron/Polyhedron_demo_normal_estimation_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Polyhedron_demo_normal_estimation_plugin.cpp @@ -169,7 +169,7 @@ void Polyhedron_demo_normal_estimation_plugin::on_actionNormalEstimation_trigger CGAL::make_normal_of_point_with_normal_pmap(points->begin()), dialog.orientationNbNeighbors()); - int nb_unoriented_normals = std::distance(first_unoriented_point, points->end()); + std::size_t nb_unoriented_normals = std::distance(first_unoriented_point, points->end()); long memory = CGAL::Memory_sizer().virtual_size(); std::cerr << "Orient normals: " << nb_unoriented_normals << " point(s) with an unoriented normal are selected (" << task_timer.time() << " seconds, " diff --git a/Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_outliers_removal_plugin.cpp b/Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_outliers_removal_plugin.cpp index f7141971045..09a1c90fc4b 100644 --- a/Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_outliers_removal_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_outliers_removal_plugin.cpp @@ -94,7 +94,7 @@ void Polyhedron_demo_point_set_outliers_removal_plugin::on_actionOutlierRemoval_ nb_neighbors, removed_percentage); - int nb_points_to_remove = std::distance(first_point_to_remove, points->end()); + std::size_t nb_points_to_remove = std::distance(first_point_to_remove, points->end()); long memory = CGAL::Memory_sizer().virtual_size(); std::cerr << "Simplification: " << nb_points_to_remove << " point(s) are selected (" << task_timer.time() << " seconds, " diff --git a/Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_simplification_plugin.cpp b/Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_simplification_plugin.cpp index d8a07c7bada..76104db70bb 100644 --- a/Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_simplification_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_simplification_plugin.cpp @@ -57,8 +57,8 @@ class Point_set_demo_point_set_simplification_dialog : public QDialog, private U } QString simplificationMethod() const { return m_simplificationMethod->currentText(); } - float randomSimplificationPercentage() const { return m_randomSimplificationPercentage->value(); } - float gridCellSize() const { return m_gridCellSize->value(); } + double randomSimplificationPercentage() const { return m_randomSimplificationPercentage->value(); } + double gridCellSize() const { return m_gridCellSize->value(); } }; void Polyhedron_demo_point_set_simplification_plugin::on_actionSimplify_triggered() @@ -111,7 +111,7 @@ void Polyhedron_demo_point_set_simplification_plugin::on_actionSimplify_triggere dialog.gridCellSize()*average_spacing); } - int nb_points_to_remove = std::distance(first_point_to_remove, points->end()); + std::size_t nb_points_to_remove = std::distance(first_point_to_remove, points->end()); long memory = CGAL::Memory_sizer().virtual_size(); std::cerr << "Simplification: " << nb_points_to_remove << " point(s) are selected for removal (" << task_timer.time() << " seconds, " diff --git a/Polyhedron/demo/Polyhedron/Polyhedron_demo_remeshing_plugin_cgal_code.cpp b/Polyhedron/demo/Polyhedron/Polyhedron_demo_remeshing_plugin_cgal_code.cpp index 2989eed07e0..6ed777bf8b2 100644 --- a/Polyhedron/demo/Polyhedron/Polyhedron_demo_remeshing_plugin_cgal_code.cpp +++ b/Polyhedron/demo/Polyhedron/Polyhedron_demo_remeshing_plugin_cgal_code.cpp @@ -103,7 +103,7 @@ private: namespace { void CGALglcolor(QColor c) { - ::glColor4f(c.red()/255.0, c.green()/255.0, c.blue()/255.0, c.alpha()/255.0); + ::glColor4d(c.red()/255.0, c.green()/255.0, c.blue()/255.0, c.alpha()/255.0); } } @@ -311,7 +311,7 @@ Scene_item* cgal_code_remesh(QWidget* parent, triangulation.dimension() < 3 ); n = triangulation.number_of_vertices()) { - const int pos = CGAL::default_random.get_int(0, polyhedron_points.size()); + const int pos = CGAL::default_random.get_int(0, (int)polyhedron_points.size()); triangulation.insert(polyhedron_points[pos]); } } diff --git a/Polyhedron/demo/Polyhedron/Polyhedron_type.h b/Polyhedron/demo/Polyhedron/Polyhedron_type.h index feaf36eda34..c67d6ff227c 100644 --- a/Polyhedron/demo/Polyhedron/Polyhedron_type.h +++ b/Polyhedron/demo/Polyhedron/Polyhedron_type.h @@ -22,6 +22,7 @@ private: typedef CGAL::HalfedgeDS_vertex_base Pdv_base; Set_of_indices indices; + std::size_t mID; public: int nb_of_feature_edges; @@ -42,8 +43,11 @@ public: return indices; } - Polyhedron_demo_vertex() : Pdv_base(), nb_of_feature_edges(0) {} - Polyhedron_demo_vertex(const Point& p) : Pdv_base(p), nb_of_feature_edges(0) {} + std::size_t& id() { return mID; } + std::size_t id() const { return mID; } + + Polyhedron_demo_vertex() : Pdv_base(), mID(-1), nb_of_feature_edges(0) {} + Polyhedron_demo_vertex(const Point& p) : Pdv_base(p), mID(-1), nb_of_feature_edges(0) {} }; template @@ -52,10 +56,11 @@ class Polyhedron_demo_halfedge : { private: bool feature_edge; + std::size_t mID; public: Polyhedron_demo_halfedge() - : feature_edge(false) {}; + : feature_edge(false), mID(-1) {}; bool is_feature_edge() const { return feature_edge; @@ -65,6 +70,10 @@ public: feature_edge = b; this->opposite()->feature_edge = b; } + + std::size_t& id() { return mID; } + std::size_t id() const { return mID; } + }; template @@ -73,11 +82,12 @@ class Polyhedron_demo_face : { private: Patch_id_ patch_id_; + std::size_t mID; public: typedef Patch_id_ Patch_id; Polyhedron_demo_face() - : patch_id_(1) {} + : patch_id_(1), mID(-1) {} int patch_id() const { return patch_id_; @@ -86,6 +96,10 @@ public: void set_patch_id(const int i) { patch_id_ = i; } + + std::size_t& id() { return mID; } + std::size_t id() const { return mID; } + }; template diff --git a/Polyhedron/demo/Polyhedron/Scene_combinatorial_map_item.cpp b/Polyhedron/demo/Polyhedron/Scene_combinatorial_map_item.cpp index e8fff1c38c4..6df06298286 100644 --- a/Polyhedron/demo/Polyhedron/Scene_combinatorial_map_item.cpp +++ b/Polyhedron/demo/Polyhedron/Scene_combinatorial_map_item.cpp @@ -88,14 +88,14 @@ void Scene_combinatorial_map_item::export_as_polyhedron(Predicate pred,const QSt struct Select_volume{ static const bool only_one_run=true; static const bool swap_orientation=false; - Select_volume(int i):volume_to_select(i),index(0){} + Select_volume(std::size_t i):volume_to_select(i),index(0){} template bool operator() (Dart_handle){ return ++index==volume_to_select; } private: - int volume_to_select; - int index; + std::size_t volume_to_select; + std::size_t index; }; void Scene_combinatorial_map_item::export_current_volume_as_polyhedron() const { @@ -227,7 +227,7 @@ void Scene_combinatorial_map_item::direct_draw() const { typedef Combinatorial_map_3::Dart_of_orbit_const_range<1> Dart_in_facet_range; Volume_dart_range dart_per_volume_range = combinatorial_map().one_dart_per_cell<3>(); - int index = 0; + std::size_t index = 0; for (Volume_dart_range::const_iterator vit=dart_per_volume_range.begin();vit!=dart_per_volume_range.end();++vit) { if (++index!=volume_to_display && volume_to_display!=0) continue; diff --git a/Polyhedron/demo/Polyhedron/Scene_combinatorial_map_item.h b/Polyhedron/demo/Polyhedron/Scene_combinatorial_map_item.h index 0df85992499..00a8b143eb4 100644 --- a/Polyhedron/demo/Polyhedron/Scene_combinatorial_map_item.h +++ b/Polyhedron/demo/Polyhedron/Scene_combinatorial_map_item.h @@ -66,7 +66,7 @@ public: private: Kernel::Vector_3 compute_face_normal(Combinatorial_map_3::Dart_const_handle adart) const; Scene_interface* last_known_scene; - int volume_to_display; + std::size_t volume_to_display; QAction* exportSelectedVolume; void* address_of_A; template void export_as_polyhedron(Predicate,const QString&) const; diff --git a/Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp b/Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp index c2fd5f390b9..7009db4a32f 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_)); } @@ -391,4 +397,32 @@ Scene_polyhedron_item::select(double orig_x, Base::select(orig_x, orig_y, orig_z, dir_x, dir_y, dir_z); } +void Scene_polyhedron_item::update_vertex_indices() +{ + std::size_t id=0; + for (Polyhedron::Vertex_iterator vit = polyhedron()->vertices_begin(), + vit_end = polyhedron()->vertices_end(); vit != vit_end; ++vit) + { + vit->id()=id++; + } +} +void Scene_polyhedron_item::update_facet_indices() +{ + std::size_t id=0; + for (Polyhedron::Facet_iterator fit = polyhedron()->facets_begin(), + fit_end = polyhedron()->facets_end(); fit != fit_end; ++fit) + { + fit->id()=id++; + } +} +void Scene_polyhedron_item::update_halfedge_indices() +{ + std::size_t id=0; + for (Polyhedron::Halfedge_iterator hit = polyhedron()->halfedges_begin(), + hit_end = polyhedron()->halfedges_end(); hit != hit_end; ++hit) + { + hit->id()=id++; + } +} + #include "Scene_polyhedron_item.moc" diff --git a/Polyhedron/demo/Polyhedron/Scene_polyhedron_item.h b/Polyhedron/demo/Polyhedron/Scene_polyhedron_item.h index 6785166c772..50087729254 100644 --- a/Polyhedron/demo/Polyhedron/Scene_polyhedron_item.h +++ b/Polyhedron/demo/Polyhedron/Scene_polyhedron_item.h @@ -51,7 +51,8 @@ public: 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); @@ -65,6 +66,10 @@ public slots: double dir_y, double dir_z); + void update_vertex_indices(); + void update_facet_indices(); + void update_halfedge_indices(); + signals: void selected_vertex(void*); void selected_facet(void*); @@ -85,6 +90,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_polylines_item.cpp b/Polyhedron/demo/Polyhedron/Scene_polylines_item.cpp index 3667b6dfef7..1c7309435d2 100644 --- a/Polyhedron/demo/Polyhedron/Scene_polylines_item.cpp +++ b/Polyhedron/demo/Polyhedron/Scene_polylines_item.cpp @@ -20,7 +20,7 @@ namespace { c = c.darker(dv); #undef darker } - ::glColor4f(c.red()/255.0, c.green()/255.0, c.blue()/255.0, c.alpha()/255.0); + ::glColor4d(c.red()/255.0, c.green()/255.0, c.blue()/255.0, c.alpha()/255.0); } } diff --git a/Polyhedron/demo/Polyhedron/include/CGAL/gl_render.h b/Polyhedron/demo/Polyhedron/include/CGAL/gl_render.h index 28613bc2a8c..225a8ea71ed 100644 --- a/Polyhedron/demo/Polyhedron/include/CGAL/gl_render.h +++ b/Polyhedron/demo/Polyhedron/include/CGAL/gl_render.h @@ -17,7 +17,7 @@ namespace { c = c.darker(dv); #undef darker } - ::glColor4f(c.red()/255.0, c.green()/255.0, c.blue()/255.0, c.alpha()/255.0); + ::glColor4d(c.red()/255.0, c.green()/255.0, c.blue()/255.0, c.alpha()/255.0); } } diff --git a/Polyhedron/demo/Polyhedron/include/Point_set_3.h b/Polyhedron/demo/Polyhedron/include/Point_set_3.h index 69f369cb58f..9bb8139b513 100644 --- a/Polyhedron/demo/Polyhedron/include/Point_set_3.h +++ b/Polyhedron/demo/Polyhedron/include/Point_set_3.h @@ -83,7 +83,7 @@ private: mutable Point m_barycenter; // point set's barycenter mutable FT m_diameter_standard_deviation; // point set's standard deviation - unsigned int m_nb_selected_points; // number of selected points + std::size_t m_nb_selected_points; // number of selected points bool m_radii_are_uptodate; @@ -108,7 +108,7 @@ public: /// @endcond /// Gets the number of selected points. - unsigned int nb_selected_points() const { return m_nb_selected_points; } + std::size_t nb_selected_points() const { return m_nb_selected_points; } /// Mark a point as selected/not selected. void select(UI_point* point, bool is_selected = true) @@ -346,7 +346,7 @@ private: FT sq_radius = 0; for (Point_const_iterator it = begin(); it != end(); it++) sq_radius += sqd(*it, m_barycenter); - sq_radius /= size(); + sq_radius /= FT(size()); m_diameter_standard_deviation = CGAL::sqrt(sq_radius); m_bounding_box_is_valid = true; diff --git a/Polyhedron/include/CGAL/Polyhedron_incremental_builder_3.h b/Polyhedron/include/CGAL/Polyhedron_incremental_builder_3.h index 91c771c3a28..9bdf4476936 100644 --- a/Polyhedron/include/CGAL/Polyhedron_incremental_builder_3.h +++ b/Polyhedron/include/CGAL/Polyhedron_incremental_builder_3.h @@ -570,7 +570,7 @@ begin_surface( std::size_t v, std::size_t f, std::size_t h, int mode) { // not know the number of facets that are holes and we do not // know the genus of the surface. So we add 12 and a factor of // 5 percent. - h = int((v + f - 2 + 12) * 2.1); + h = (std::size_t)((double)(v + f - 2 + 12) * 2.1); } hds.reserve( hds.size_of_vertices() + v, hds.size_of_halfedges() + h, diff --git a/QP_solver/include/CGAL/QP_solver/QP_functions_impl.h b/QP_solver/include/CGAL/QP_solver/QP_functions_impl.h index 3f9286cbeff..c9442e8884e 100644 --- a/QP_solver/include/CGAL/QP_solver/QP_functions_impl.h +++ b/QP_solver/include/CGAL/QP_solver/QP_functions_impl.h @@ -46,7 +46,7 @@ namespace QP_functions_detail { // type of LinearInequalitySystem must be convertible to ET template bool has_linearly_independent_equations - (const Ar& ar, const ET& dummy) { + (const Ar& ar, const ET& /*dummy*/) { // we solve the following auxiliary LP, using exact type ET: // -------- // min 0 diff --git a/Qt_widget/src/CGALQt3/CMakeLists.txt b/Qt_widget/src/CGAL_Qt3/CMakeLists.txt similarity index 89% rename from Qt_widget/src/CGALQt3/CMakeLists.txt rename to Qt_widget/src/CGAL_Qt3/CMakeLists.txt index 0ced524340b..ef24865e3ae 100644 --- a/Qt_widget/src/CGALQt3/CMakeLists.txt +++ b/Qt_widget/src/CGAL_Qt3/CMakeLists.txt @@ -43,7 +43,7 @@ if( QT3_FOUND ) link_directories ( ${CGAL_LIBRARIES_DIR} ${CGAL_3RD_PARTY_LIBRARIES_DIRS} ) - # Make sure QT3_AUTOMOC compiler can find CGALQt3 include files + # Make sure QT3_AUTOMOC compiler can find CGAL_Qt3 include files include_directories( BEFORE ${CGAL_INCLUDE_DIRS} ) # Make sure the compiler can find generated .moc files @@ -53,7 +53,7 @@ if( QT3_FOUND ) set(CGAL_Qt3_MOC_FILES "") foreach (package ${CGAL_CONFIGURED_PACKAGES} ) - file(GLOB PACKAGE_QTMOC_FILES "${package}/src/CGALQt3/*.qtmoc.cmake") + file(GLOB PACKAGE_QTMOC_FILES "${package}/src/CGAL_Qt3/*.qtmoc.cmake") foreach(package_qtmoc_file ${PACKAGE_QTMOC_FILES}) # includes 'moccing' for sources/headers in package + collects lists of moc-files for dependency (to properly build the lib) include(${package_qtmoc_file}) @@ -63,7 +63,7 @@ if( QT3_FOUND ) # message(STATUS QT3-mocfiles: ${CGAL_Qt3_MOC_FILES}) - collect_cgal_library( CGAL_Qt3 CGALQt3 "${CGAL_Qt3_MOC_FILES}") + collect_cgal_library( CGAL_Qt3 "${CGAL_Qt3_MOC_FILES}") foreach(mocfile ${CGAL_Qt3_MOC_FILES}) add_file_dependencies(${CMAKE_CURRENT_BINARY_DIR}/all_files.cpp ${CMAKE_CURRENT_BINARY_DIR}/${mocfile}) @@ -79,9 +79,9 @@ if( QT3_FOUND ) else() - message( STATUS "CGAL_Qt3 needs OpenGL, cannot be configured.") + message( STATUS "libCGAL_Qt3 needs OpenGL, cannot be configured.") endif() else() - message( STATUS "CGAL_Qt3 needs Qt3, cannot be configured.") + message( STATUS "libCGAL_Qt3 needs Qt3, cannot be configured.") endif() diff --git a/Qt_widget/src/CGALQt3/Qt_help_window.cpp b/Qt_widget/src/CGAL_Qt3/Qt_help_window.cpp similarity index 100% rename from Qt_widget/src/CGALQt3/Qt_help_window.cpp rename to Qt_widget/src/CGAL_Qt3/Qt_help_window.cpp diff --git a/Qt_widget/src/CGALQt3/Qt_widget.cpp b/Qt_widget/src/CGAL_Qt3/Qt_widget.cpp similarity index 100% rename from Qt_widget/src/CGALQt3/Qt_widget.cpp rename to Qt_widget/src/CGAL_Qt3/Qt_widget.cpp diff --git a/Qt_widget/src/CGALQt3/Qt_widget.qtmoc.cmake b/Qt_widget/src/CGAL_Qt3/Qt_widget.qtmoc.cmake similarity index 100% rename from Qt_widget/src/CGALQt3/Qt_widget.qtmoc.cmake rename to Qt_widget/src/CGAL_Qt3/Qt_widget.qtmoc.cmake diff --git a/Qt_widget/src/CGALQt3/Qt_widget_history.cpp b/Qt_widget/src/CGAL_Qt3/Qt_widget_history.cpp similarity index 100% rename from Qt_widget/src/CGALQt3/Qt_widget_history.cpp rename to Qt_widget/src/CGAL_Qt3/Qt_widget_history.cpp diff --git a/Qt_widget/src/CGALQt3/Qt_widget_layer.cpp b/Qt_widget/src/CGAL_Qt3/Qt_widget_layer.cpp similarity index 100% rename from Qt_widget/src/CGALQt3/Qt_widget_layer.cpp rename to Qt_widget/src/CGAL_Qt3/Qt_widget_layer.cpp diff --git a/Qt_widget/src/CGALQt3/Qt_widget_standard_toolbar.cpp b/Qt_widget/src/CGAL_Qt3/Qt_widget_standard_toolbar.cpp similarity index 100% rename from Qt_widget/src/CGALQt3/Qt_widget_standard_toolbar.cpp rename to Qt_widget/src/CGAL_Qt3/Qt_widget_standard_toolbar.cpp diff --git a/Qt_widget/src/CGALQt3/Qt_widget_xpm_icons.cpp b/Qt_widget/src/CGAL_Qt3/Qt_widget_xpm_icons.cpp similarity index 100% rename from Qt_widget/src/CGALQt3/Qt_widget_xpm_icons.cpp rename to Qt_widget/src/CGAL_Qt3/Qt_widget_xpm_icons.cpp diff --git a/Ridges_3/examples/Ridges_3/CMakeLists.txt b/Ridges_3/examples/Ridges_3/CMakeLists.txt index c595d80fe14..447d87025c3 100644 --- a/Ridges_3/examples/Ridges_3/CMakeLists.txt +++ b/Ridges_3/examples/Ridges_3/CMakeLists.txt @@ -39,14 +39,10 @@ if ( CGAL_FOUND ) message( STATUS "Boost.ProgramOptions library: ${Boost_PROGRAM_OPTIONS_LIBRARY}" ) endif() add_definitions( "-DCGAL_USE_BOOST_PROGRAM_OPTIONS" ) - if ( NOT CGAL_AUTO_LINK_ENABLED ) - link_libraries( ${Boost_PROGRAM_OPTIONS_LIBRARY} ) - endif() - endif() + list(APPEND CGAL_3RD_PARTY_LIBRARIES ${Boost_PROGRAM_OPTIONS_LIBRARY}) + endif() - add_executable(Compute_Ridges_Umbilics Compute_Ridges_Umbilics.cpp PolyhedralSurf.cpp) - add_to_cached_list( CGAL_EXECUTABLE_TARGETS Compute_Ridges_Umbilics ) - target_link_libraries(Compute_Ridges_Umbilics ${CGAL_LIBRARIES}) + create_single_source_cgal_program( Compute_Ridges_Umbilics.cpp PolyhedralSurf.cpp) else(EIGEN3_FOUND OR LAPACK_FOUND) diff --git a/STL_Extension/include/CGAL/iterator.h b/STL_Extension/include/CGAL/iterator.h index 28ba59bd001..40f3d059cc5 100644 --- a/STL_Extension/include/CGAL/iterator.h +++ b/STL_Extension/include/CGAL/iterator.h @@ -29,6 +29,7 @@ #include #include +#include #include #include #include @@ -318,6 +319,7 @@ public: Iterator current_iterator() const { return nt;} bool operator==( Nullptr_t p) const { + CGAL_USE(p); CGAL_assertion( p == 0); return empty; } diff --git a/STL_Extension/test/STL_Extension/test_Compact_container.cpp b/STL_Extension/test/STL_Extension/test_Compact_container.cpp index 509b4da7476..51db525399b 100644 --- a/STL_Extension/test/STL_Extension/test_Compact_container.cpp +++ b/STL_Extension/test/STL_Extension/test_Compact_container.cpp @@ -7,9 +7,8 @@ #include #include #include +#include -template < typename T > -void use(const T&) {} struct Node_1 : public CGAL::Compact_container_base @@ -52,16 +51,16 @@ void test(const Cont &) // Testing if all types are provided. typename Cont::value_type t0; - typename Cont::reference t1 = t0; use(t1); - typename Cont::const_reference t2 = t0; use(t2); + typename Cont::reference t1 = t0; CGAL_USE(t1); + typename Cont::const_reference t2 = t0; CGAL_USE(t2); typename Cont::pointer t3 = &t0; - typename Cont::const_pointer t4 = &t0; use(t4); - typename Cont::size_type t5 = 0; use(t5); - typename Cont::difference_type t6 = t3-t3; use(t6); - typename Cont::iterator t7; use(t7); - typename Cont::const_iterator t8; use(t8); - typename Cont::reverse_iterator t9; use(t9); - typename Cont::const_reverse_iterator t10; use(t10); + typename Cont::const_pointer t4 = &t0; CGAL_USE(t4); + typename Cont::size_type t5 = 0; CGAL_USE(t5); + typename Cont::difference_type t6 = t3-t3; CGAL_USE(t6); + typename Cont::iterator t7; CGAL_USE(t7); + typename Cont::const_iterator t8; CGAL_USE(t8); + typename Cont::reverse_iterator t9; CGAL_USE(t9); + typename Cont::const_reverse_iterator t10; CGAL_USE(t10); typename Cont::allocator_type t15; std::cout << "Testing empty containers." << std::endl; @@ -82,7 +81,7 @@ void test(const Cont &) c8.insert(c0.rbegin(), c0.rend()); // test conversion iterator-> const_iterator. - typename Cont::const_iterator t16 = c5.begin(); use(t16); + typename Cont::const_iterator t16 = c5.begin(); CGAL_USE(t16); assert(t16 == c5.begin()); assert(c0 == c1); diff --git a/STL_Extension/test/STL_Extension/test_multiset.cpp b/STL_Extension/test/STL_Extension/test_multiset.cpp index 2c9906e2774..8fa0219f9c8 100644 --- a/STL_Extension/test/STL_Extension/test_multiset.cpp +++ b/STL_Extension/test/STL_Extension/test_multiset.cpp @@ -32,6 +32,7 @@ #include #include #include +#include void test_massive_insert_and_erase(); void test_iterators(); diff --git a/Scripts/developer_scripts/cgal_generate_cmake_script.cmake b/Scripts/developer_scripts/cgal_generate_cmake_script.cmake index a28add1db32..8d8a5aca698 100755 --- a/Scripts/developer_scripts/cgal_generate_cmake_script.cmake +++ b/Scripts/developer_scripts/cgal_generate_cmake_script.cmake @@ -280,7 +280,8 @@ if ( NOT ${BOOST_COMPONENTS} STREQUAL "") file(APPEND CMakeLists.txt "# Boost linking\n" ) foreach (BOOST_COMPONENT ${BOOST_COMPONENTS}) - file(APPEND CMakeLists.txt "link_libraries( \${Boost_${BOOST_COMPONENT}_LIBRARY} )\n") + file(APPEND CMakeLists.txt "add_definitions( \"-DCGAL_USE_BOOST_${BOOST_COMPONENT}\" )") + file(APPEND CMakeLists.txt "list(APPEND CGAL_3RD_PARTY_LIBRARIES \${Boost_${BOOST_COMPONENT}_LIBRARY} )\n") endforeach() file(APPEND CMakeLists.txt "\n") diff --git a/Scripts/developer_scripts/check_licenses b/Scripts/developer_scripts/check_licenses index 7d95930afdd..afe82dabcdf 100755 --- a/Scripts/developer_scripts/check_licenses +++ b/Scripts/developer_scripts/check_licenses @@ -64,11 +64,11 @@ if [ ! -f INSTALL ]; then fi licensecheck -r * -c $CHECK_PATTERN | grep -Ev ': L?GPL \(v3 or later\)' | \ - grep -v "^$DIR/\|^include/CGAL/CORE/\|^include/CGAL/OpenNL/\|^src/CGALCore/\|^src/CGALimageIO/\|^config/support/\|test/\|^Packages/\|^developer_scripts\|^doc_tex/\|^winutils/\|^cmake/platforms" | sort >$PREFIX1 || true + grep -v "^$DIR/\|^include/CGAL/CORE/\|^include/CGAL/OpenNL/\|^src/CGAL_Core/\|^src/CGAL_ImageIO/\|^config/support/\|test/\|^Packages/\|^developer_scripts\|^doc_tex/\|^winutils/\|^cmake/platforms" | sort >$PREFIX1 || true echo Note that files in the following directories are ignored: echo include/CGAL/CORE, include/CGAL/OpenNL, -echo src/CGALCore, src/CGALimageIO, config/support, +echo src/CGAL_Core, src/CGAL_ImageIO, config/support, echo test, Packages, developer_scripts, doc_tex, winutils echo 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/scripts/cgal_create_CMakeLists b/Scripts/scripts/cgal_create_CMakeLists index 4742c1dd760..fdf482d01c7 100755 --- a/Scripts/scripts/cgal_create_CMakeLists +++ b/Scripts/scripts/cgal_create_CMakeLists @@ -346,7 +346,8 @@ EOF IFS=':' for boost_component in $BOOST_COMPONENTS; do BOOST_COMPONENT=`echo $boost_component | tr '[:lower:]' '[:upper:]'` - echo "link_libraries( \${Boost_${BOOST_COMPONENT}_LIBRARY} )" + echo "add_definitions( \"-DCGAL_USE_BOOST_${BOOST_COMPONENT}\" )" + echo "list(APPEND CGAL_3RD_PARTY_LIBRARIES \${Boost_${BOOST_COMPONENT}_LIBRARY} )" done IFS=$OLDIFS @@ -411,7 +412,7 @@ EOF include_directories( ${QT3_INCLUDE_DIR} ) - link_libraries( ${QT3_LIBRARIES} ) + list(APPEND CGAL_3RD_PARTY_LIBRARIES ${QT3_LIBRARIES} ) endif() @@ -610,7 +611,7 @@ usage() echo "Usage: `basename $0` [-s source] [-c cgal-component1:cgal-component2:...] [-b boost-component1:boost-component2:...] [-p] [-o options_file='`pwd`/cgal_cmake_options:$HOME/.cgal_cmake_options_rc'] [-v] [-h]" >&2 echo >&2 echo " -s source If this parameter is given the script will create one single executable for 'source' with all source files; otherwise it creates one executable for each main'ed source." >&2 - echo " cgal_componentX - must be a valid cgal component, examples are 'Core','imageIO','Qt3','Qt4' ('benchmark', 'symbolic')." >&2 + echo " cgal_componentX - must be a valid cgal component, examples are 'Core','ImageIO','Qt3','Qt4' ('benchmark', 'symbolic')." >&2 echo " boost_componentX - must be a valid boost component, like 'filesystem', 'program_options'." >&2 echo " -p use all of CGAL's preconfigured libraries" >&2 echo " -o options_file - file with PACKAGE, DIRECTORY, CGAL_COMPONENT, and BOOST_COMPONENT directives" >&2 diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_simple_site_2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_simple_site_2.h index ae305225b19..edb0870ac1b 100644 --- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_simple_site_2.h +++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_simple_site_2.h @@ -77,8 +77,8 @@ public: public: // these "constructors" are defined in order to conform with the // specs; they will produce a run-time error if used - static Self construct_site_2(const Point_2& p1, const Point_2& p2, - const Point_2& q1, const Point_2& q2) { + static Self construct_site_2(const Point_2& /*p1*/, const Point_2& /*p2*/, + const Point_2& /*q1*/, const Point_2& /*q2*/) { no_constructor_support(); return Self(); } @@ -125,12 +125,12 @@ public: // the following four methods do not really make any sense but have // been added in order for this class to be a model of the // SegmentDelaunayGraphSite_2 concept. - const Point_2& source_of_supporting_site(unsigned int i) const { + const Point_2& source_of_supporting_site(unsigned int /*i*/) const { CGAL_precondition( is_point() && !is_input() ); return p_[0]; } - const Point_2& target_of_supporting_site(unsigned int i) const { + const Point_2& target_of_supporting_site(unsigned int /*i*/) const { CGAL_precondition( is_point() && !is_input() ); return p_[0]; } diff --git a/iostream/doc_tex/IOstream/Color.tex b/Stream_support/doc_tex/IOstream/Color.tex similarity index 100% rename from iostream/doc_tex/IOstream/Color.tex rename to Stream_support/doc_tex/IOstream/Color.tex diff --git a/iostream/doc_tex/IOstream/IOstream.tex b/Stream_support/doc_tex/IOstream/IOstream.tex similarity index 100% rename from iostream/doc_tex/IOstream/IOstream.tex rename to Stream_support/doc_tex/IOstream/IOstream.tex diff --git a/iostream/doc_tex/IOstream/PkgDescription.tex b/Stream_support/doc_tex/IOstream/PkgDescription.tex similarity index 100% rename from iostream/doc_tex/IOstream/PkgDescription.tex rename to Stream_support/doc_tex/IOstream/PkgDescription.tex diff --git a/iostream/doc_tex/IOstream/io.png b/Stream_support/doc_tex/IOstream/io.png similarity index 100% rename from iostream/doc_tex/IOstream/io.png rename to Stream_support/doc_tex/IOstream/io.png diff --git a/iostream/doc_tex/IOstream/main.tex b/Stream_support/doc_tex/IOstream/main.tex similarity index 100% rename from iostream/doc_tex/IOstream/main.tex rename to Stream_support/doc_tex/IOstream/main.tex diff --git a/iostream/doc_tex/IOstream_ref/Color.tex b/Stream_support/doc_tex/IOstream_ref/Color.tex similarity index 100% rename from iostream/doc_tex/IOstream_ref/Color.tex rename to Stream_support/doc_tex/IOstream_ref/Color.tex diff --git a/iostream/doc_tex/IOstream_ref/Input_rep.tex b/Stream_support/doc_tex/IOstream_ref/Input_rep.tex similarity index 100% rename from iostream/doc_tex/IOstream_ref/Input_rep.tex rename to Stream_support/doc_tex/IOstream_ref/Input_rep.tex diff --git a/iostream/doc_tex/IOstream_ref/Mode.tex b/Stream_support/doc_tex/IOstream_ref/Mode.tex similarity index 100% rename from iostream/doc_tex/IOstream_ref/Mode.tex rename to Stream_support/doc_tex/IOstream_ref/Mode.tex diff --git a/iostream/doc_tex/IOstream_ref/Output_rep.tex b/Stream_support/doc_tex/IOstream_ref/Output_rep.tex similarity index 100% rename from iostream/doc_tex/IOstream_ref/Output_rep.tex rename to Stream_support/doc_tex/IOstream_ref/Output_rep.tex diff --git a/iostream/doc_tex/IOstream_ref/get_mode.tex b/Stream_support/doc_tex/IOstream_ref/get_mode.tex similarity index 100% rename from iostream/doc_tex/IOstream_ref/get_mode.tex rename to Stream_support/doc_tex/IOstream_ref/get_mode.tex diff --git a/iostream/doc_tex/IOstream_ref/iformat.tex b/Stream_support/doc_tex/IOstream_ref/iformat.tex similarity index 100% rename from iostream/doc_tex/IOstream_ref/iformat.tex rename to Stream_support/doc_tex/IOstream_ref/iformat.tex diff --git a/iostream/doc_tex/IOstream_ref/input_operator.tex b/Stream_support/doc_tex/IOstream_ref/input_operator.tex similarity index 100% rename from iostream/doc_tex/IOstream_ref/input_operator.tex rename to Stream_support/doc_tex/IOstream_ref/input_operator.tex diff --git a/iostream/doc_tex/IOstream_ref/intro.tex b/Stream_support/doc_tex/IOstream_ref/intro.tex similarity index 100% rename from iostream/doc_tex/IOstream_ref/intro.tex rename to Stream_support/doc_tex/IOstream_ref/intro.tex diff --git a/iostream/doc_tex/IOstream_ref/is_ascii.tex b/Stream_support/doc_tex/IOstream_ref/is_ascii.tex similarity index 100% rename from iostream/doc_tex/IOstream_ref/is_ascii.tex rename to Stream_support/doc_tex/IOstream_ref/is_ascii.tex diff --git a/iostream/doc_tex/IOstream_ref/is_binary.tex b/Stream_support/doc_tex/IOstream_ref/is_binary.tex similarity index 100% rename from iostream/doc_tex/IOstream_ref/is_binary.tex rename to Stream_support/doc_tex/IOstream_ref/is_binary.tex diff --git a/iostream/doc_tex/IOstream_ref/is_pretty.tex b/Stream_support/doc_tex/IOstream_ref/is_pretty.tex similarity index 100% rename from iostream/doc_tex/IOstream_ref/is_pretty.tex rename to Stream_support/doc_tex/IOstream_ref/is_pretty.tex diff --git a/iostream/doc_tex/IOstream_ref/main.tex b/Stream_support/doc_tex/IOstream_ref/main.tex similarity index 100% rename from iostream/doc_tex/IOstream_ref/main.tex rename to Stream_support/doc_tex/IOstream_ref/main.tex diff --git a/iostream/doc_tex/IOstream_ref/oformat.tex b/Stream_support/doc_tex/IOstream_ref/oformat.tex similarity index 100% rename from iostream/doc_tex/IOstream_ref/oformat.tex rename to Stream_support/doc_tex/IOstream_ref/oformat.tex diff --git a/iostream/doc_tex/IOstream_ref/output_operator.tex b/Stream_support/doc_tex/IOstream_ref/output_operator.tex similarity index 100% rename from iostream/doc_tex/IOstream_ref/output_operator.tex rename to Stream_support/doc_tex/IOstream_ref/output_operator.tex diff --git a/iostream/doc_tex/IOstream_ref/set_ascii_mode.tex b/Stream_support/doc_tex/IOstream_ref/set_ascii_mode.tex similarity index 100% rename from iostream/doc_tex/IOstream_ref/set_ascii_mode.tex rename to Stream_support/doc_tex/IOstream_ref/set_ascii_mode.tex diff --git a/iostream/doc_tex/IOstream_ref/set_binary_mode.tex b/Stream_support/doc_tex/IOstream_ref/set_binary_mode.tex similarity index 100% rename from iostream/doc_tex/IOstream_ref/set_binary_mode.tex rename to Stream_support/doc_tex/IOstream_ref/set_binary_mode.tex diff --git a/iostream/doc_tex/IOstream_ref/set_mode.tex b/Stream_support/doc_tex/IOstream_ref/set_mode.tex similarity index 100% rename from iostream/doc_tex/IOstream_ref/set_mode.tex rename to Stream_support/doc_tex/IOstream_ref/set_mode.tex diff --git a/iostream/doc_tex/IOstream_ref/set_pretty_mode.tex b/Stream_support/doc_tex/IOstream_ref/set_pretty_mode.tex similarity index 100% rename from iostream/doc_tex/IOstream_ref/set_pretty_mode.tex rename to Stream_support/doc_tex/IOstream_ref/set_pretty_mode.tex diff --git a/iostream/include/CGAL/IO/Color.h b/Stream_support/include/CGAL/IO/Color.h similarity index 100% rename from iostream/include/CGAL/IO/Color.h rename to Stream_support/include/CGAL/IO/Color.h diff --git a/iostream/include/CGAL/IO/io.h b/Stream_support/include/CGAL/IO/io.h similarity index 98% rename from iostream/include/CGAL/IO/io.h rename to Stream_support/include/CGAL/IO/io.h index 4d2b777f2ed..8b746d093a0 100644 --- a/iostream/include/CGAL/IO/io.h +++ b/Stream_support/include/CGAL/IO/io.h @@ -274,7 +274,7 @@ std::istream &operator>>(std::istream &is, Color& col) std::cerr << "Stream must be in ascii or binary mode" << std::endl; break; } - col = Color(r,g,b); + col = Color((unsigned char)r,(unsigned char)g,(unsigned char)b); return is; } diff --git a/iostream/include/CGAL/IO/io_tags.h b/Stream_support/include/CGAL/IO/io_tags.h similarity index 100% rename from iostream/include/CGAL/IO/io_tags.h rename to Stream_support/include/CGAL/IO/io_tags.h diff --git a/Stream_support/package_info/Stream_support/description.txt b/Stream_support/package_info/Stream_support/description.txt index b670cd7af2e..babb025bb7c 100644 --- a/Stream_support/package_info/Stream_support/description.txt +++ b/Stream_support/package_info/Stream_support/description.txt @@ -1 +1 @@ -Stream support: General stream iterator and Verbose_ostream. +Stream support: General stream iterator, Verbose_ostream and support for io modes and tags. diff --git a/iostream/src/CGAL/Color.cpp b/Stream_support/src/CGAL/Color.cpp similarity index 100% rename from iostream/src/CGAL/Color.cpp rename to Stream_support/src/CGAL/Color.cpp diff --git a/iostream/src/CGAL/io.cpp b/Stream_support/src/CGAL/io.cpp similarity index 100% rename from iostream/src/CGAL/io.cpp rename to Stream_support/src/CGAL/io.cpp diff --git a/iostream/test/iostream/data/io.cin b/Stream_support/test/Stream_support/data/io.cin similarity index 100% rename from iostream/test/iostream/data/io.cin rename to Stream_support/test/Stream_support/data/io.cin diff --git a/iostream/test/iostream/test_ioformat.cpp b/Stream_support/test/Stream_support/test_ioformat.cpp similarity index 100% rename from iostream/test/iostream/test_ioformat.cpp rename to Stream_support/test/Stream_support/test_ioformat.cpp diff --git a/Subdivision_method_3/include/CGAL/Polyhedron_decorator_3.h b/Subdivision_method_3/include/CGAL/Polyhedron_decorator_3.h index 42ff1e7dbe6..d359f65c5ae 100644 --- a/Subdivision_method_3/include/CGAL/Polyhedron_decorator_3.h +++ b/Subdivision_method_3/include/CGAL/Polyhedron_decorator_3.h @@ -116,7 +116,7 @@ public: a <----------> b H is the return halfedge connecting vertex a to b. */ - static Halfedge* insert_edge(Polyhedron& p, Vertex* a, Vertex* b) { + static Halfedge* insert_edge(Polyhedron& /*p*/, Vertex* a, Vertex* b) { return insert_edge(Vertex_handle(a), Vertex_handle(b)).ptr(); } // diff --git a/Subdivision_method_3/include/CGAL/Subdivision_mask_3.h b/Subdivision_method_3/include/CGAL/Subdivision_mask_3.h index b63cfe6fd35..5f59a5e1dc2 100644 --- a/Subdivision_method_3/include/CGAL/Subdivision_mask_3.h +++ b/Subdivision_method_3/include/CGAL/Subdivision_mask_3.h @@ -104,7 +104,7 @@ public: pt = vertex->point(); } // - void border_node(Halfedge_handle edge, Point& ept, Point& vpt){ + void border_node(Halfedge_handle edge, Point& ept, Point& /*vpt*/){ edge_node(edge, ept); } }; @@ -237,9 +237,9 @@ public: if (n == 6) { pt = Point((10*S[0]+R[0])/16, (10*S[1]+R[1])/16, (10*S[2]+R[2])/16); } else { - FT Cn = (FT) (5.0/8.0 - std::sqrt(3+2*std::cos(6.283/n))/64.0); - FT Sw = n*(1-Cn)/Cn; - FT W = n/Cn; + FT Cn = (FT) (5.0/8.0 - std::sqrt(3+2*std::cos(6.283/(double)n))/64.0); + FT Sw = (double)n*(1-Cn)/Cn; + FT W = (double)n/Cn; pt = Point((Sw*S[0]+R[0])/W, (Sw*S[1]+R[1])/W, (Sw*S[2]+R[2])/W); } } @@ -279,7 +279,7 @@ public: public: // - void corner_node(Halfedge_handle edge, Point& pt) {}; + void corner_node(Halfedge_handle /*edge*/, Point& /*pt*/) {}; }; @@ -358,11 +358,11 @@ public: Halfedge_around_vertex_circulator vcir = vertex->vertex_begin(); size_t n = circulator_size(vcir); - FT a = (FT) ((4.0-2.0*std::cos(2.0*CGAL_PI/n))/9.0); + FT a = (FT) ((4.0-2.0*std::cos(2.0*CGAL_PI/(double)n))/9.0); Vector cv = ((FT)(1.0-a)) * (vertex->point() - CGAL::ORIGIN); for (size_t i = 1; i <= n; ++i, --vcir) { - cv = cv + (a/n)*(vcir->opposite()->vertex()->point()-CGAL::ORIGIN); + cv = cv + (a/FT(n))*(vcir->opposite()->vertex()->point()-CGAL::ORIGIN); } pt = CGAL::ORIGIN + cv; diff --git a/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt b/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt index 02f17da8a01..486c885799f 100644 --- a/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt +++ b/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt @@ -69,10 +69,8 @@ if ( CGAL_FOUND ) message( STATUS "Boost.ProgramOptions library: ${Boost_PROGRAM_OPTIONS_LIBRARY}" ) endif() add_definitions( "-DCGAL_USE_BOOST_PROGRAM_OPTIONS" ) - if ( NOT CGAL_AUTO_LINK_ENABLED ) - link_libraries( ${Boost_PROGRAM_OPTIONS_LIBRARY} ) - endif() - endif() + list(APPEND CGAL_3RD_PARTY_LIBRARIES ${Boost_PROGRAM_OPTIONS_LIBRARY}) + endif() # Executables that do *not* use TAUCS create_single_source_cgal_program( "Authalic_parameterization.cpp" ) diff --git a/Surface_mesher/demo/Surface_mesher/CMakeLists.txt b/Surface_mesher/demo/Surface_mesher/CMakeLists.txt index b47f80d8975..4f1a8a29ce4 100644 --- a/Surface_mesher/demo/Surface_mesher/CMakeLists.txt +++ b/Surface_mesher/demo/Surface_mesher/CMakeLists.txt @@ -15,12 +15,12 @@ set(PACKAGE_ROOT ../..) # Add several CGAL packages to the include and link paths, # if they lie in ${PACKAGE_ROOT}/. -foreach(INC_DIR ${PACKAGE_ROOT}/include ${PACKAGE_ROOT}/../Mesh_2/include ${PACKAGE_ROOT}/../Data_structure_for_queries_3/include ${PACKAGE_ROOT}/../Marching_cube/include ${PACKAGE_ROOT}/../CGALimageIO/include ${PACKAGE_ROOT}/../GraphicsView/include) +foreach(INC_DIR ${PACKAGE_ROOT}/include ${PACKAGE_ROOT}/../Mesh_2/include ${PACKAGE_ROOT}/../Data_structure_for_queries_3/include ${PACKAGE_ROOT}/../Marching_cube/include ${PACKAGE_ROOT}/../CGAL_ImageIO/include ${PACKAGE_ROOT}/../GraphicsView/include) if (EXISTS ${INC_DIR}) include_directories (BEFORE ${INC_DIR}) endif() endforeach() -foreach(LIB_DIR ${PACKAGE_ROOT}/../CGALimageIO/src/CGALimageIO ${PACKAGE_ROOT}/../GraphicsView/src/CGALQt4) +foreach(LIB_DIR ${PACKAGE_ROOT}/../CGAL_ImageIO/src/CGAL_ImageIO ${PACKAGE_ROOT}/../GraphicsView/src/CGALQt4) if (EXISTS ${LIB_DIR}) link_directories (${LIB_DIR}) endif() diff --git a/Surface_mesher/demo/Surface_mesher/VTK/CMakeLists.txt b/Surface_mesher/demo/Surface_mesher/VTK/CMakeLists.txt index 35f1bcf5fb6..9b265aa4812 100644 --- a/Surface_mesher/demo/Surface_mesher/VTK/CMakeLists.txt +++ b/Surface_mesher/demo/Surface_mesher/VTK/CMakeLists.txt @@ -6,12 +6,12 @@ set(PACKAGE_ROOT ../../..) # Add several CGAL packages to the include and link paths, # if they lie in ${PACKAGE_ROOT}/. -foreach(INC_DIR ${PACKAGE_ROOT}/include ${PACKAGE_ROOT}/../Mesh_2/include ${PACKAGE_ROOT}/../Data_structure_for_queries_3/include ${PACKAGE_ROOT}/../Marching_cube/include ${PACKAGE_ROOT}/../CGALimageIO/include) +foreach(INC_DIR ${PACKAGE_ROOT}/include ${PACKAGE_ROOT}/../Mesh_2/include ${PACKAGE_ROOT}/../Data_structure_for_queries_3/include ${PACKAGE_ROOT}/../Marching_cube/include ${PACKAGE_ROOT}/../CGAL_ImageIO/include) if (EXISTS ${INC_DIR}) include_directories (BEFORE ${INC_DIR}) endif() endforeach() -foreach(LIB_DIR ${PACKAGE_ROOT}/../CGALimageIO/src/CGALimageIO) +foreach(LIB_DIR ${PACKAGE_ROOT}/../CGAL_ImageIO/src/CGAL_ImageIO) if (EXISTS ${LIB_DIR}) link_directories (${LIB_DIR}) endif() diff --git a/Surface_mesher/demo/Surface_mesher/VTK/mesh_a_3D_image.cpp b/Surface_mesher/demo/Surface_mesher/VTK/mesh_a_3D_image.cpp index 5a8c77236f7..a81bf50809b 100644 --- a/Surface_mesher/demo/Surface_mesher/VTK/mesh_a_3D_image.cpp +++ b/Surface_mesher/demo/Surface_mesher/VTK/mesh_a_3D_image.cpp @@ -1,7 +1,7 @@ // This demo has been inspired from the file // Examples/Medical/Cxx/Medical1.cxx in VTK-5.0. -// Adaptation to CGALimageIO made by: Laurent Rineau +// Adaptation to CGAL_ImageIO made by: Laurent Rineau /* Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen diff --git a/Surface_mesher/doc_tex/Surface_mesher_ref/Gray_level_image_3.tex b/Surface_mesher/doc_tex/Surface_mesher_ref/Gray_level_image_3.tex index ab6cbf304ed..47a8d948a87 100644 --- a/Surface_mesher/doc_tex/Surface_mesher_ref/Gray_level_image_3.tex +++ b/Surface_mesher/doc_tex/Surface_mesher_ref/Gray_level_image_3.tex @@ -42,12 +42,12 @@ in the input 3D gray image. %\ccc{ImplicitFunction}. \ccRefName\ provides an interface with an auxiliary library called -\emph{CGALimageIO}. An executable that uses \ccRefName\ must be linked with -the \emph{CGALimageIO} library. This library is shipped with \cgal{} and +\emph{CGAL\_ImageIO}. An executable that uses \ccRefName\ must be linked with +the \emph{CGAL\_ImageIO} library. This library is shipped with \cgal{} and will be linked automatically by any makefile created by the script \ccc{cgal_create_makefile}. -The library \emph{CGALimageIO} and therefore \ccRefName\ support +The library \emph{CGAL\_ImageIO} and therefore \ccRefName\ support several types of 3D images: INRIMAGE (extension .inr[.gz]), GIS (extension .dim, of .ima[.gz]), and ANALYZE (extension .hdr, or .img[.gz]). diff --git a/Surface_mesher/include/CGAL/IO/Complex_2_in_triangulation_3_polyhedron_builder.h b/Surface_mesher/include/CGAL/IO/Complex_2_in_triangulation_3_polyhedron_builder.h index 85ed4c19699..b0990134667 100644 --- a/Surface_mesher/include/CGAL/IO/Complex_2_in_triangulation_3_polyhedron_builder.h +++ b/Surface_mesher/include/CGAL/IO/Complex_2_in_triangulation_3_polyhedron_builder.h @@ -42,6 +42,19 @@ private: const C2t3& c2t3; typedef CGAL::Modifier_base Base; + template + int get_vertex_index(IBuilder& builder, Vertex_handle vh, std::map& V, int& inum) + { + typedef typename std::map::iterator map_iterator; + std::pair insert_res = V.insert( std::make_pair(vh,inum) ); + if ( insert_res.second ){ + typename Tr::Point p = static_cast(vh->point()); + builder.add_vertex(p); + ++inum; + } + return insert_res.first->second; + } + public: Complex_2_in_triangulation_3_polyhedron_builder(const C2t3& c2t3) : Base(), c2t3(c2t3) @@ -64,16 +77,6 @@ public: number_of_facets); { // Finite vertices coordinates. - std::map V; - int inum = 0; - for(Finite_vertices_iterator vit = tr.finite_vertices_begin(); - vit != tr.finite_vertices_end(); - ++vit) - { - V[vit] = inum++; - Point p = static_cast(vit->point()); - builder.add_vertex(p); - } Finite_facets_iterator fit = tr.finite_facets_begin(); std::set oriented_set; std::stack stack; @@ -135,6 +138,10 @@ public: const Vector Z(0, 0, 1); bool regular_orientation = (Z * normal >= 0); + //used to set indices of vertices + std::map V; + int inum = 0; + for(typename std::set::const_iterator fit = oriented_set.begin(); fit != oriented_set.end(); @@ -143,8 +150,9 @@ public: int indices[3]; int index = 0; for (int i=0; i<3; i++) - indices[index++] = - V[fit->first->vertex(tr.vertex_triple_index(fit->second, i))]; + indices[index++] = get_vertex_index( + builder, fit->first->vertex(tr.vertex_triple_index(fit->second, i)), V, inum + ); builder.begin_facet(); builder.add_vertex_to_facet(indices[0]); builder.add_vertex_to_facet(regular_orientation ? indices[1] : indices[2]); diff --git a/Surface_mesher/include/CGAL/Surface_mesh_default_criteria_3.h b/Surface_mesher/include/CGAL/Surface_mesh_default_criteria_3.h index fcded9e59ff..cd7c78fe43b 100644 --- a/Surface_mesher/include/CGAL/Surface_mesh_default_criteria_3.h +++ b/Surface_mesher/include/CGAL/Surface_mesh_default_criteria_3.h @@ -76,7 +76,7 @@ private: template std::ostream& operator<<(std::ostream& os, - const typename Surface_mesh_default_criteria_3::Quality& q) + const typename Surface_mesh_default_criteria_3::Quality& /*q*/) { return os << "q"; } diff --git a/Testsuite/include/CGAL/Testsuite/use.h b/Testsuite/include/CGAL/Testsuite/use.h index 0e7aca616ed..daee40b9051 100644 --- a/Testsuite/include/CGAL/Testsuite/use.h +++ b/Testsuite/include/CGAL/Testsuite/use.h @@ -20,15 +20,9 @@ #ifndef CGAL_TESTSUITE_USE_H #define CGAL_TESTSUITE_USE_H -namespace CGAL { namespace internal { +// This is a wrapper file, for backward compatibility. +// The macro CGAL_USE is now defined in -template < typename T > inline -void use(const T&) {} - -} } - -// CGAL_USE() is a macro which aims at removing "variable is unused" warnings. - -#define CGAL_USE(x) ::CGAL::internal::use(x) +#include #endif // CGAL_TESTSUITE_USE_H diff --git a/Testsuite/test/collect_cgal_testresults_from_cmake b/Testsuite/test/collect_cgal_testresults_from_cmake index daa21f63f71..4cf57924b6e 100755 --- a/Testsuite/test/collect_cgal_testresults_from_cmake +++ b/Testsuite/test/collect_cgal_testresults_from_cmake @@ -44,7 +44,7 @@ print_testresult() # grep -E means "extended regular expressions". # All those three options are in the Single Unix Specification version 3 - # The extended regular expression '[^a-zA-Z_,]warning matches any + # The extended regular expression '[^a-zA-Z_,:-]warning matches any # string "warning" preceded with a letter that is not a letter or '_' # or ',' or ':'. That avoids some false positives such as # '-read_only_relocs,warning' or '-D_CRT_SECURE_NO_WARNINGS', or @@ -276,8 +276,8 @@ output_main_logs parse_flags_and_third_party_choices -parse_lib_building_results "libCGALCore" "CGAL_Core" parse_lib_building_results "libCGAL" "CGAL" +parse_lib_building_results "libCGALCore" "CGAL_Core" parse_lib_building_results "libCGALimageIO" "CGAL_ImageIO" parse_lib_building_results "libCGALQt" "CGAL_Qt3" parse_lib_building_results "libCGALQt4" "CGAL_Qt4" diff --git a/Triangulation_2/demo/Triangulation_2/qt3/CMakeLists.txt b/Triangulation_2/demo/Triangulation_2/qt3/CMakeLists.txt index ba59b78c0aa..ad3f11a8078 100644 --- a/Triangulation_2/demo/Triangulation_2/qt3/CMakeLists.txt +++ b/Triangulation_2/demo/Triangulation_2/qt3/CMakeLists.txt @@ -12,6 +12,8 @@ if ( CGAL_FOUND ) include( ${CGAL_USE_FILE} ) + include( CGAL_CreateSingleSourceCGALProgram ) + find_package(Qt3-patched QUIET ) # FindQt3-patched.cmake is FindQt3.cmake patched by CGAL developers, so # that it can be used together with FindQt4: all its variables are prefixed @@ -27,28 +29,26 @@ if ( CGAL_FOUND ) include_directories( ${QT3_INCLUDE_DIR} ) - # Link the executables to CGAL and third-party libraries - link_libraries(${QT3_LIBRARIES} ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} ) - - add_executable(delaunay_triangulation_2 + create_single_source_cgal_program( delaunay_triangulation_2.cpp triangulation_2_edit_vertex.cpp delaunay_triangulation_2_toolbar.cpp delaunay_triangulation_2_toolbar_layers.cpp) - - add_executable(regular_triangulation_2 + + + create_single_source_cgal_program( regular_triangulation_2.cpp triangulation_2_edit_vertex.cpp regular_triangulation_2_toolbar.cpp regular_triangulation_2_toolbar_layers.cpp) - add_executable(constrained_delaunay_triangulation_2 + create_single_source_cgal_program( constrained_delaunay_triangulation_2.cpp constrained_delaunay_triangulation_2_toolbar.cpp constrained_delaunay_triangulation_2_toolbar_layers.cpp) - add_executable(constrained constrained.cpp) - + create_single_source_cgal_program(constrained.cpp) + else() message(STATUS "NOTICE: This demo requires Qt3 and the CGAL Qt3 library, and will not be compiled.") diff --git a/Triangulation_2/doc_tex/Triangulation_2_ref/Constrained_Delaunay_triangulation_2.tex b/Triangulation_2/doc_tex/Triangulation_2_ref/Constrained_Delaunay_triangulation_2.tex index 6b59987f4eb..ef3da0ac0d4 100644 --- a/Triangulation_2/doc_tex/Triangulation_2_ref/Constrained_Delaunay_triangulation_2.tex +++ b/Triangulation_2/doc_tex/Triangulation_2_ref/Constrained_Delaunay_triangulation_2.tex @@ -51,7 +51,7 @@ constraints and is to be used when the traits class provides exact predicates but approximate constructions of the -intersection points. +intersection points,\\ \ccc{CGAL::Exact_intersections_tag} allows intersections between input constraints and is to be used in conjunction diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Adaptation_traits_functors.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Adaptation_traits_functors.h index ed02ee7ed0e..41d2f641275 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Adaptation_traits_functors.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Adaptation_traits_functors.h @@ -33,7 +33,7 @@ namespace VoronoiDiagram_2 { namespace Internal { struct Null_functor { Null_functor() {} - template Null_functor(T t) {} + template Null_functor(T /*t*/) {} }; //========================================================================= diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Default_site_inserters.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Default_site_inserters.h index b73075eea4d..014b5feeb71 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Default_site_inserters.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Default_site_inserters.h @@ -127,7 +127,7 @@ class Default_caching_site_inserter { public: Default_caching_site_inserter() {} - template Default_caching_site_inserter(T t) {} + template Default_caching_site_inserter(T /*t*/) {} }; //=========================================================================== diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Default_site_removers.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Default_site_removers.h index 593f7632c69..dedece6a6d5 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Default_site_removers.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Default_site_removers.h @@ -105,7 +105,7 @@ class Default_caching_site_remover { public: Default_caching_site_remover() {} - template Default_caching_site_remover(T t) {} + template Default_caching_site_remover(T /*t*/) {} }; //=========================================================================== diff --git a/copyright b/copyright index f89f4138a44..61eb29fb3f4 100644 --- a/copyright +++ b/copyright @@ -22,8 +22,9 @@ R = RU Groningen BGL G Boolean_set_operations_2 T Box_intersection_d M + CGAL_Core NYU; Chee Yap agreed to upgrade + CGAL_ImageIO third party lib under LGPL CGAL_ipelets I - CGALimageIO third party lib under LGPL Cartesian_kernel ETIMU Circular_kernel_2 I Circular_kernel_3 I @@ -34,7 +35,6 @@ R = RU Groningen Convex_hull_2 M Convex_hull_3 M Convex_hull_d M - Core NYU; Chee Yap agreed to upgrade Developers_manual ETIMU Distance_2 ETIMU Distance_3 ETIMU diff --git a/iostream/package_info/iostream/copyright b/iostream/package_info/iostream/copyright deleted file mode 100644 index a35c66ade4c..00000000000 --- a/iostream/package_info/iostream/copyright +++ /dev/null @@ -1,5 +0,0 @@ -Utrecht University (The Netherlands), -ETH Zurich (Switzerland), -INRIA Sophia-Antipolis (France), -Max-Planck-Institute Saarbruecken (Germany), -Tel-Aviv University (Israel). diff --git a/iostream/package_info/iostream/description.txt b/iostream/package_info/iostream/description.txt deleted file mode 100644 index 69eb1a48539..00000000000 --- a/iostream/package_info/iostream/description.txt +++ /dev/null @@ -1 +0,0 @@ -IO package: support for iostream (io modes, tags) diff --git a/iostream/package_info/iostream/license.txt b/iostream/package_info/iostream/license.txt deleted file mode 100644 index 0b91802ccd4..00000000000 --- a/iostream/package_info/iostream/license.txt +++ /dev/null @@ -1 +0,0 @@ -LGPL (v3 or later) diff --git a/iostream/package_info/iostream/maintainer b/iostream/package_info/iostream/maintainer deleted file mode 100644 index 7e028c78627..00000000000 --- a/iostream/package_info/iostream/maintainer +++ /dev/null @@ -1 +0,0 @@ -cgal-develop 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