diff --git a/.travis.yml b/.travis.yml index 3154fc76141..bba533ca213 100644 --- a/.travis.yml +++ b/.travis.yml @@ -103,47 +103,19 @@ install: - bash .travis/install.sh - if [[ "$CXX" = "clang++" ]]; then export CXX=clang++-3.6 CC=clang-3.6; fi before_script: +- wget -O doxygen_exe https://cgal.geometryfactory.com/~mgimeno/doxygen_exe +- sudo mv doxygen_exe /usr/bin/doxygen +- sudo chmod +x /usr/bin/doxygen - mkdir -p build - cd build -- cmake -DCGAL_HEADER_ONLY=ON -DQt5_DIR="/opt/qt55/lib/cmake/Qt5" -DQt5Svg_DIR="/opt/qt55/lib/cmake/Qt5Svg" -DQt5OpenGL_DIR="/opt/qt55/lib/cmake/Qt5OpenGL" -DCMAKE_CXX_FLAGS_RELEASE=-DCGAL_NDEBUG .. +- cmake -DCMAKE_CXX_FLAGS="-std=c++11" -DCGAL_HEADER_ONLY=ON -DQt5_DIR="/opt/qt55/lib/cmake/Qt5" -DQt5Svg_DIR="/opt/qt55/lib/cmake/Qt5Svg" -DQt5OpenGL_DIR="/opt/qt55/lib/cmake/Qt5OpenGL" -DCMAKE_CXX_FLAGS_RELEASE=-DCGAL_NDEBUG .. - make - sudo make install &>/dev/null - cd .. - sudo bash ./.travis/install_openmesh.sh -script: +script: - cd ./.travis - bash -x -e ./build_package.sh $PACKAGE -addons: - apt: - sources: - - sourceline: 'ppa:ppsspp/cmake' - - sourceline: 'ppa:hedges/qt5.5' - packages: - - clang-3.6 - - zsh - - cmake - - libboost1.55-dev - - libboost-system1.55-dev - - libboost-program-options1.55-dev - - libboost-thread1.55-dev - - libboost-iostreams1.55-dev - - libgmp-dev - - libmpfr-dev - - libmpfi-dev - - zlib1g-dev - - libeigen3-dev # too old - - qt55base - - qt55script - - qt55svg - - qt55tools - - qt55graphicaleffects - - - mesa-common-dev - - libglu1-mesa-dev - # Not allowed (yet) - # - geomview - # - libglew1.5-dev - # - libipe-dev notifications: email: on_success: change # default: always diff --git a/.travis/build_package.sh b/.travis/build_package.sh index 5bc7b796a68..8309c2f56e9 100755 --- a/.travis/build_package.sh +++ b/.travis/build_package.sh @@ -47,7 +47,7 @@ function build_demo { cmake -DCGAL_DIR="/usr/local/lib/cmake/CGAL" -DQt5_DIR="/opt/qt55/lib/cmake/Qt5" -DQt5Svg_DIR="/opt/qt55/lib/cmake/Qt5Svg" -DQt5OpenGL_DIR="/opt/qt55/lib/cmake/Qt5OpenGL" -DCGAL_DONT_OVERRIDE_CMAKE_FLAGS:BOOL=ON -DCMAKE_CXX_FLAGS_RELEASE="${CXX_FLAGS} ${EXTRA_CXX_FLAGS}" .. make -j2 } - +old_IFS=$IFS IFS=$' ' ROOT="$PWD/.." NEED_3D=0 @@ -55,14 +55,14 @@ for ARG in $(echo "$@") do if [ "$ARG" = "CHECK" ] then + IFS=$old_IFS zsh $ROOT/Scripts/developer_scripts/test_merge_of_branch HEAD - mkdir -p build-travis - pushd build-travis - cmake -DCGAL_ENABLE_CHECK_HEADERS=ON -DQt5_DIR="/opt/qt55/lib/cmake/Qt5" ../.. - make -j2 check_headers - popd + #test dependencies + cd $ROOT + bash Scripts/developer_scripts/cgal_check_dependencies.sh /usr/bin/doxygen + cd .travis #parse current matrix and check that no package has been forgotten - old_IFS=$IFS + IFS=$'\n' COPY=0 MATRIX=() @@ -82,7 +82,7 @@ do done DIFFERENCE=$(echo ${MATRIX[@]} ${PACKAGES[@]} | tr ' ' '\n' | sort | uniq -u) - IFS=$old_IFS + IFS=$' ' if [ "${DIFFERENCE[0]}" != "" ] then echo "The matrix and the actual package list differ : ." @@ -116,9 +116,20 @@ do cd .. exit 0 fi - EXAMPLES="$ARG/examples/$ARG" - TEST="$ARG/test/$ARG" - DEMOS=$ROOT/$ARG/demo/* + + IFS=$old_IFS + if [ -n "$TRAVIS_PULL_REQUEST" ] && [ "$ARG" != Polyhedron_demo ]; then + DO_IGNORE=FALSE + . $ROOT/.travis/test_package.sh "$ROOT" "$ARG" + echo "DO_IGNORE is $DO_IGNORE" + if [ "$DO_IGNORE" = "TRUE" ]; then + continue + fi + fi + IFS=$' ' + EXAMPLES="$ARG/examples/$ARG" + TEST="$ARG/test/$ARG" + DEMOS=$ROOT/$ARG/demo/* if [ "$ARG" = AABB_tree ] || [ "$ARG" = Alpha_shapes_3 ] ||\ [ "$ARG" = Circular_kernel_3 ] || [ "$ARG" = Linear_cell_complex ] ||\ [ "$ARG" = Periodic_3_triangulation_3 ] || [ "$ARG" = Principal_component_analysis ] ||\ @@ -126,21 +137,21 @@ do NEED_3D=1 fi - if [ -d "$ROOT/$EXAMPLES" ] - then + if [ -d "$ROOT/$EXAMPLES" ] + then cd $ROOT/$EXAMPLES build_examples elif [ "$ARG" != Polyhedron_demo ]; then echo "No example found for $ARG" - fi + fi - if [ -d "$ROOT/$TEST" ] - then + if [ -d "$ROOT/$TEST" ] + then cd $ROOT/$TEST build_tests elif [ "$ARG" != Polyhedron_demo ]; then echo "No test found for $ARG" - fi + fi #Packages like Periodic_3_triangulation_3 contain multiple demos for DEMO in $DEMOS; do DEMO=${DEMO#"$ROOT"} @@ -164,7 +175,7 @@ do build_demo fi done - +IFS=$old_IFS # Local Variables: # tab-width: 2 # sh-basic-offset: 2 diff --git a/.travis/install.sh b/.travis/install.sh index f4684522cfe..e3dfe9dbb4e 100644 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -12,7 +12,7 @@ do DONE=1 && sudo -E apt-add-repository -y "ppa:hedges/qt5.5" || DONE=0 && sleep 5 done -for pkg in clang-3.6 zsh cmake libboost1.55-dev libboost-system1.55-dev libboost-program-options1.55-dev libboost-thread1.55-dev libboost-iostreams1.55-dev libgmp-dev libmpfr-dev libmpfi-dev zlib1g-dev libeigen3-dev qt55base qt55script qt55svg qt55tools qt55graphicaleffects mesa-common-dev libglu1-mesa-dev +for pkg in clang-3.6 zsh flex bison cmake graphviz libboost1.55-dev libboost-system1.55-dev libboost-program-options1.55-dev libboost-thread1.55-dev libboost-iostreams1.55-dev libgmp-dev libmpfr-dev libmpfi-dev zlib1g-dev libeigen3-dev qt55base qt55script qt55svg qt55tools qt55graphicaleffects libopencv-dev mesa-common-dev libmetis-dev libglu1-mesa-dev do DONE=0 while [ $DONE = 0 ] @@ -20,3 +20,4 @@ do DONE=1 && sudo -E apt-get -yq --no-install-suggests --no-install-recommends --force-yes install $pkg || DONE=0 && sudo apt-get update done done + diff --git a/.travis/template.txt b/.travis/template.txt index b483bfd89c3..32ef77d336e 100644 --- a/.travis/template.txt +++ b/.travis/template.txt @@ -7,49 +7,20 @@ matrix: install: - bash .travis/install.sh - if [[ "$CXX" = "clang++" ]]; then export CXX=clang++-3.6 CC=clang-3.6; fi - before_script: +- wget -O doxygen_exe https://cgal.geometryfactory.com/~mgimeno/doxygen_exe +- sudo mv doxygen_exe /usr/bin/doxygen +- sudo chmod +x /usr/bin/doxygen - mkdir -p build - cd build -- cmake -DCGAL_HEADER_ONLY=ON -DQt5_DIR="/opt/qt55/lib/cmake/Qt5" -DQt5Svg_DIR="/opt/qt55/lib/cmake/Qt5Svg" -DQt5OpenGL_DIR="/opt/qt55/lib/cmake/Qt5OpenGL" -DCMAKE_CXX_FLAGS_RELEASE=-DCGAL_NDEBUG .. +- cmake -DCMAKE_CXX_FLAGS="-std=c++11" -DCGAL_HEADER_ONLY=ON -DQt5_DIR="/opt/qt55/lib/cmake/Qt5" -DQt5Svg_DIR="/opt/qt55/lib/cmake/Qt5Svg" -DQt5OpenGL_DIR="/opt/qt55/lib/cmake/Qt5OpenGL" -DCMAKE_CXX_FLAGS_RELEASE=-DCGAL_NDEBUG .. - make - sudo make install &>/dev/null - cd .. - sudo bash ./.travis/install_openmesh.sh -script: +script: - cd ./.travis - bash -x -e ./build_package.sh $PACKAGE -addons: - apt: - sources: - - sourceline: 'ppa:ppsspp/cmake' - - sourceline: 'ppa:hedges/qt5.5' - packages: - - clang-3.6 - - zsh - - cmake - - libboost1.55-dev - - libboost-system1.55-dev - - libboost-program-options1.55-dev - - libboost-thread1.55-dev - - libboost-iostreams1.55-dev - - libgmp-dev - - libmpfr-dev - - libmpfi-dev - - zlib1g-dev - - libeigen3-dev # too old - - qt55base - - qt55script - - qt55svg - - qt55tools - - qt55graphicaleffects - - - mesa-common-dev - - libglu1-mesa-dev - # Not allowed (yet) - # - geomview - # - libglew1.5-dev - # - libipe-dev notifications: email: on_success: change # default: always diff --git a/.travis/test_package.sh b/.travis/test_package.sh new file mode 100644 index 00000000000..930ba4fcdb3 --- /dev/null +++ b/.travis/test_package.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +#Will cd $1 and test package named $2 +#to find out if it or one of its dependencies has changed in the current branch + +DO_IGNORE=FALSE +cd $1 +if [ ! -f "$2/package_info/$ARG/dependencies" ];then + echo "No dependencies found for $2" + return +fi +LIST_OF_FILES=$(git diff --name-only origin/master |cut -d/ -f1 |uniq |sort) +LIST_OF_DEPS=$(cat "$2/package_info/$ARG/dependencies") +echo "$LIST_OF_DEPS" +for flie in $LIST_OF_DEPS +do + [[ $LIST_OF_FILES =~ (^|[[:space:]])$flie($|[[:space:]]) ]] && return +done +echo "Package ignored because none of its dependencies has been modified." +DO_IGNORE=TRUE + diff --git a/AABB_tree/package_info/AABB_tree/dependencies b/AABB_tree/package_info/AABB_tree/dependencies new file mode 100644 index 00000000000..297b8bbf9b9 --- /dev/null +++ b/AABB_tree/package_info/AABB_tree/dependencies @@ -0,0 +1,19 @@ + +AABB_tree +Algebraic_foundations +BGL +Cartesian_kernel +Circulator +Distance_2 +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +Profiling_tools +Property_map +STL_Extension +Spatial_searching +Stream_support diff --git a/Advancing_front_surface_reconstruction/package_info/Advancing_front_surface_reconstruction/dependencies b/Advancing_front_surface_reconstruction/package_info/Advancing_front_surface_reconstruction/dependencies new file mode 100644 index 00000000000..3f89df2428d --- /dev/null +++ b/Advancing_front_surface_reconstruction/package_info/Advancing_front_surface_reconstruction/dependencies @@ -0,0 +1,34 @@ + +Advancing_front_surface_reconstruction +Algebraic_foundations +Arithmetic_kernel +BGL +Cartesian_kernel +Circulator +Distance_2 +Distance_3 +Filtered_kernel +HalfedgeDS +Hash_map +Homogeneous_kernel +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Kernel_d +Modifier +Modular_arithmetic +Number_types +Polygon +Polyhedron +Polyhedron_IO +Profiling_tools +Property_map +STL_Extension +Spatial_sorting +Stream_support +TDS_2 +TDS_3 +Triangulation_2 +Triangulation_3 diff --git a/Algebraic_foundations/package_info/Algebraic_foundations/dependencies b/Algebraic_foundations/package_info/Algebraic_foundations/dependencies new file mode 100644 index 00000000000..e323621c3b0 --- /dev/null +++ b/Algebraic_foundations/package_info/Algebraic_foundations/dependencies @@ -0,0 +1,10 @@ + +Algebraic_foundations +Installation +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +Profiling_tools +STL_Extension +Stream_support diff --git a/Algebraic_kernel_d/package_info/Algebraic_kernel_d/dependencies b/Algebraic_kernel_d/package_info/Algebraic_kernel_d/dependencies new file mode 100644 index 00000000000..7e92ed6d189 --- /dev/null +++ b/Algebraic_kernel_d/package_info/Algebraic_kernel_d/dependencies @@ -0,0 +1,16 @@ + +Algebraic_foundations +Algebraic_kernel_d +Arithmetic_kernel +CGAL_Core +Circulator +Installation +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +Polynomial +Profiling_tools +Random_numbers +STL_Extension +Stream_support diff --git a/Algebraic_kernel_for_circles/package_info/Algebraic_kernel_for_circles/dependencies b/Algebraic_kernel_for_circles/package_info/Algebraic_kernel_for_circles/dependencies new file mode 100644 index 00000000000..ccd077b9391 --- /dev/null +++ b/Algebraic_kernel_for_circles/package_info/Algebraic_kernel_for_circles/dependencies @@ -0,0 +1,13 @@ + +Algebraic_foundations +Algebraic_kernel_for_circles +Arithmetic_kernel +Filtered_kernel +Installation +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +Profiling_tools +STL_Extension +Stream_support diff --git a/Algebraic_kernel_for_spheres/package_info/Algebraic_kernel_for_spheres/dependencies b/Algebraic_kernel_for_spheres/package_info/Algebraic_kernel_for_spheres/dependencies new file mode 100644 index 00000000000..ce905ac4c76 --- /dev/null +++ b/Algebraic_kernel_for_spheres/package_info/Algebraic_kernel_for_spheres/dependencies @@ -0,0 +1,13 @@ + +Algebraic_foundations +Algebraic_kernel_for_spheres +Arithmetic_kernel +Filtered_kernel +Installation +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +Profiling_tools +STL_Extension +Stream_support diff --git a/Alpha_shapes_2/package_info/Alpha_shapes_2/dependencies b/Alpha_shapes_2/package_info/Alpha_shapes_2/dependencies new file mode 100644 index 00000000000..87446ab8449 --- /dev/null +++ b/Alpha_shapes_2/package_info/Alpha_shapes_2/dependencies @@ -0,0 +1,18 @@ + +Algebraic_foundations +Alpha_shapes_2 +Arithmetic_kernel +Cartesian_kernel +Filtered_kernel +Hash_map +Homogeneous_kernel +Installation +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +Profiling_tools +STL_Extension +Stream_support +TDS_2 +Triangulation_2 diff --git a/Alpha_shapes_3/package_info/Alpha_shapes_3/dependencies b/Alpha_shapes_3/package_info/Alpha_shapes_3/dependencies new file mode 100644 index 00000000000..4241d0f06a1 --- /dev/null +++ b/Alpha_shapes_3/package_info/Alpha_shapes_3/dependencies @@ -0,0 +1,23 @@ + +Algebraic_foundations +Alpha_shapes_3 +Arithmetic_kernel +Cartesian_kernel +Circulator +Filtered_kernel +Geomview +Hash_map +Homogeneous_kernel +Installation +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +Polygon +Profiling_tools +Property_map +STL_Extension +Spatial_sorting +Stream_support +TDS_3 +Triangulation_3 diff --git a/Apollonius_graph_2/package_info/Apollonius_graph_2/dependencies b/Apollonius_graph_2/package_info/Apollonius_graph_2/dependencies new file mode 100644 index 00000000000..42075b2cefa --- /dev/null +++ b/Apollonius_graph_2/package_info/Apollonius_graph_2/dependencies @@ -0,0 +1,25 @@ + +Algebraic_foundations +Apollonius_graph_2 +Arithmetic_kernel +Cartesian_kernel +Circulator +Distance_2 +Distance_3 +Filtered_kernel +Hash_map +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +Polygon +Profiling_tools +Property_map +STL_Extension +Spatial_sorting +Stream_support +TDS_2 +Triangulation_2 diff --git a/Arithmetic_kernel/package_info/Arithmetic_kernel/dependencies b/Arithmetic_kernel/package_info/Arithmetic_kernel/dependencies new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_curve_data_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_curve_data_traits_2.h index b8b5ab5c530..4789c7c08cb 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_curve_data_traits_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_curve_data_traits_2.h @@ -415,7 +415,7 @@ public: template typename boost::enable_if_c::value, X_monotone_curve_2>::type - construct_opposite(const X_monotone_curve_2& cv) const + construct_opposite(const X_monotone_curve_2&) const { CGAL_error_msg("Construct opposite curve is not supported!"); return X_monotone_curve_2(); diff --git a/Arrangement_on_surface_2/package_info/Arrangement_on_surface_2/dependencies b/Arrangement_on_surface_2/package_info/Arrangement_on_surface_2/dependencies new file mode 100644 index 00000000000..0d656a88ed9 --- /dev/null +++ b/Arrangement_on_surface_2/package_info/Arrangement_on_surface_2/dependencies @@ -0,0 +1,33 @@ + +Algebraic_foundations +Algebraic_kernel_d +Arithmetic_kernel +Arrangement_on_surface_2 +BGL +CGAL_Core +Cartesian_kernel +Circular_kernel_2 +Circulator +Distance_2 +Distance_3 +Filtered_kernel +HalfedgeDS +Hash_map +Homogeneous_kernel +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Kernel_d +Modular_arithmetic +Number_types +Polygon +Polynomial +Profiling_tools +Property_map +Random_numbers +STL_Extension +Spatial_searching +Stream_support +Surface_sweep_2 diff --git a/BGL/include/CGAL/boost/graph/METIS/partition_dual_graph.h b/BGL/include/CGAL/boost/graph/METIS/partition_dual_graph.h index 09d6e01cf16..e59aa23f0fb 100644 --- a/BGL/include/CGAL/boost/graph/METIS/partition_dual_graph.h +++ b/BGL/include/CGAL/boost/graph/METIS/partition_dual_graph.h @@ -56,7 +56,7 @@ void partition_dual_graph(const TriangleMesh& tm, int nparts, typedef typename boost::graph_traits::face_iterator face_iterator; // vertex index map - typedef typename GetVertexIndexMap::type Indices; + typedef typename CGAL::Polygon_mesh_processing::GetVertexIndexMap::type Indices; Indices indices = choose_param(get_param(np, internal_np::vertex_index), get_const_property_map(boost::vertex_index, tm)); diff --git a/BGL/include/CGAL/boost/graph/METIS/partition_graph.h b/BGL/include/CGAL/boost/graph/METIS/partition_graph.h index 8619f4dd184..86d3ca818b8 100644 --- a/BGL/include/CGAL/boost/graph/METIS/partition_graph.h +++ b/BGL/include/CGAL/boost/graph/METIS/partition_graph.h @@ -92,7 +92,7 @@ void partition_graph(const TriangleMesh& tm, int nparts, typedef typename boost::graph_traits::face_iterator face_iterator; //Vertex index map - typedef typename GetVertexIndexMap::type Indices; + typedef typename CGAL::Polygon_mesh_processing::GetVertexIndexMap::type Indices; Indices indices = choose_param(get_param(np, internal_np::vertex_index), get_const_property_map(boost::vertex_index, tm)); diff --git a/BGL/include/CGAL/boost/graph/convert_nef_polyhedron_to_polygon_mesh.h b/BGL/include/CGAL/boost/graph/convert_nef_polyhedron_to_polygon_mesh.h index 888de1c2149..0c8f9c553f9 100644 --- a/BGL/include/CGAL/boost/graph/convert_nef_polyhedron_to_polygon_mesh.h +++ b/BGL/include/CGAL/boost/graph/convert_nef_polyhedron_to_polygon_mesh.h @@ -32,6 +32,7 @@ #include #include #include +#include namespace CGAL{ @@ -95,7 +96,6 @@ struct Shell_polygons_visitor std::size_t get_cycle_length( typename Nef_polyhedron::Halffacet_cycle_const_iterator hfc) const { - typename Nef_polyhedron::SHalfedge_const_handle h(hfc); typename Nef_polyhedron::SHalfedge_around_facet_const_circulator hc_start(hfc), hc_end(hc_start); std::size_t i=0; CGAL_For_all(hc_start,hc_end) diff --git a/BGL/include/CGAL/boost/graph/selection.h b/BGL/include/CGAL/boost/graph/selection.h index 88a3994aa9b..7ba5dc7984d 100644 --- a/BGL/include/CGAL/boost/graph/selection.h +++ b/BGL/include/CGAL/boost/graph/selection.h @@ -572,14 +572,14 @@ void expand_face_selection_for_removal(const FaceRange& faces_to_be_deleted, // set hd to the last selected face of a connected component // of selected faces around a vertex halfedge_descriptor hd = halfedge(vd, tm); - while( !get(is_selected, face(hd, tm)) ) + while(is_border(hd,tm) || ( !get(is_selected, face(hd, tm))) ) { hd = opposite( next(hd, tm), tm); CGAL_assertion( hd != halfedge(vd, tm) ); } halfedge_descriptor start = hd; halfedge_descriptor next_around_vertex = opposite( next(hd, tm), tm); - while( get(is_selected, face(next_around_vertex, tm) ) ) + while(is_border(next_around_vertex,tm) || get(is_selected, face(next_around_vertex, tm) ) ) { hd = next_around_vertex; next_around_vertex = opposite( next(hd, tm), tm); diff --git a/BGL/package_info/BGL/dependencies b/BGL/package_info/BGL/dependencies new file mode 100644 index 00000000000..61fb7f37566 --- /dev/null +++ b/BGL/package_info/BGL/dependencies @@ -0,0 +1,29 @@ + +Algebraic_foundations +Arithmetic_kernel +BGL +Cartesian_kernel +Circulator +Distance_2 +Distance_3 +Filtered_kernel +Hash_map +Homogeneous_kernel +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Kernel_d +Modular_arithmetic +Number_types +Polygon +Polygon_mesh_processing +Profiling_tools +Property_map +STL_Extension +Solver_interface +Spatial_sorting +Stream_support +TDS_2 +Triangulation_2 diff --git a/BGL/test/BGL/graph_concept_Triangulation_2.cpp b/BGL/test/BGL/graph_concept_Triangulation_2.cpp index 0e9cd16d3b8..7f2629931e8 100644 --- a/BGL/test/BGL/graph_concept_Triangulation_2.cpp +++ b/BGL/test/BGL/graph_concept_Triangulation_2.cpp @@ -2,6 +2,7 @@ #include #include #include +#include #include #include #include @@ -51,10 +52,12 @@ int main() { concept_check_triangulation(); concept_check_triangulation(); + concept_check_triangulation(); concept_check_triangulation(); concept_check_triangulation(); concept_check_triangulation(); concept_check_triangulation(); concept_check_triangulation(); + return 0; } diff --git a/Barycentric_coordinates_2/package_info/Barycentric_coordinates_2/dependencies b/Barycentric_coordinates_2/package_info/Barycentric_coordinates_2/dependencies new file mode 100644 index 00000000000..63c59708dd0 --- /dev/null +++ b/Barycentric_coordinates_2/package_info/Barycentric_coordinates_2/dependencies @@ -0,0 +1,10 @@ + +Algebraic_foundations +Barycentric_coordinates_2 +Installation +Kernel_23 +Number_types +Polygon +Profiling_tools +STL_Extension +Stream_support diff --git a/Boolean_set_operations_2/package_info/Boolean_set_operations_2/dependencies b/Boolean_set_operations_2/package_info/Boolean_set_operations_2/dependencies new file mode 100644 index 00000000000..5a495096d7d --- /dev/null +++ b/Boolean_set_operations_2/package_info/Boolean_set_operations_2/dependencies @@ -0,0 +1,28 @@ + +Algebraic_foundations +Arithmetic_kernel +Arrangement_on_surface_2 +Boolean_set_operations_2 +Cartesian_kernel +Circular_kernel_2 +Circulator +Distance_2 +Distance_3 +Filtered_kernel +HalfedgeDS +Hash_map +Homogeneous_kernel +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Kernel_d +Modular_arithmetic +Number_types +Polygon +Profiling_tools +STL_Extension +Stream_support +Surface_sweep_2 +Union_find diff --git a/Bounding_volumes/package_info/Bounding_volumes/dependencies b/Bounding_volumes/package_info/Bounding_volumes/dependencies new file mode 100644 index 00000000000..05255b2cf24 --- /dev/null +++ b/Bounding_volumes/package_info/Bounding_volumes/dependencies @@ -0,0 +1,24 @@ + +Algebraic_foundations +Bounding_volumes +Cartesian_kernel +Circulator +Distance_2 +Distance_3 +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Kernel_d +Matrix_search +Modular_arithmetic +Number_types +Optimisation_basic +Polygon +Profiling_tools +QP_solver +Random_numbers +STL_Extension +Solver_interface +Stream_support diff --git a/Box_intersection_d/package_info/Box_intersection_d/dependencies b/Box_intersection_d/package_info/Box_intersection_d/dependencies new file mode 100644 index 00000000000..968b6c34d25 --- /dev/null +++ b/Box_intersection_d/package_info/Box_intersection_d/dependencies @@ -0,0 +1,11 @@ + +Algebraic_foundations +Box_intersection_d +Installation +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +Profiling_tools +STL_Extension +Stream_support diff --git a/CGAL_Core/package_info/CGAL_Core/dependencies b/CGAL_Core/package_info/CGAL_Core/dependencies new file mode 100644 index 00000000000..e69de29bb2d diff --git a/CGAL_ImageIO/package_info/CGAL_ImageIO/dependencies b/CGAL_ImageIO/package_info/CGAL_ImageIO/dependencies new file mode 100644 index 00000000000..1b16569f666 --- /dev/null +++ b/CGAL_ImageIO/package_info/CGAL_ImageIO/dependencies @@ -0,0 +1,11 @@ + +Algebraic_foundations +CGAL_ImageIO +Installation +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +Profiling_tools +STL_Extension +Stream_support diff --git a/CGAL_ipelets/package_info/CGAL_ipelets/dependencies b/CGAL_ipelets/package_info/CGAL_ipelets/dependencies new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Cartesian_kernel/package_info/Cartesian_kernel/dependencies b/Cartesian_kernel/package_info/Cartesian_kernel/dependencies new file mode 100644 index 00000000000..1b1e516f40c --- /dev/null +++ b/Cartesian_kernel/package_info/Cartesian_kernel/dependencies @@ -0,0 +1,15 @@ + +Algebraic_foundations +Cartesian_kernel +Distance_2 +Distance_3 +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +Profiling_tools +STL_Extension +Stream_support diff --git a/Circular_kernel_2/package_info/Circular_kernel_2/dependencies b/Circular_kernel_2/package_info/Circular_kernel_2/dependencies new file mode 100644 index 00000000000..eff87b1b32a --- /dev/null +++ b/Circular_kernel_2/package_info/Circular_kernel_2/dependencies @@ -0,0 +1,19 @@ + +Algebraic_foundations +Algebraic_kernel_for_circles +Arithmetic_kernel +Cartesian_kernel +Circular_kernel_2 +Distance_2 +Distance_3 +Filtered_kernel +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +Profiling_tools +STL_Extension +Stream_support diff --git a/Circular_kernel_3/package_info/Circular_kernel_3/dependencies b/Circular_kernel_3/package_info/Circular_kernel_3/dependencies new file mode 100644 index 00000000000..5d98eec60ed --- /dev/null +++ b/Circular_kernel_3/package_info/Circular_kernel_3/dependencies @@ -0,0 +1,19 @@ + +Algebraic_foundations +Algebraic_kernel_for_spheres +Arithmetic_kernel +Cartesian_kernel +Circular_kernel_3 +Distance_2 +Distance_3 +Filtered_kernel +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +Profiling_tools +STL_Extension +Stream_support diff --git a/Circulator/package_info/Circulator/dependencies b/Circulator/package_info/Circulator/dependencies new file mode 100644 index 00000000000..c3d98a8dc0d --- /dev/null +++ b/Circulator/package_info/Circulator/dependencies @@ -0,0 +1,6 @@ + +Circulator +Installation +Kernel_23 +Profiling_tools +STL_Extension diff --git a/Classification/include/CGAL/Classification/Color.h b/Classification/include/CGAL/Classification/Color.h index 205daed3471..8b619b9c497 100644 --- a/Classification/include/CGAL/Classification/Color.h +++ b/Classification/include/CGAL/Classification/Color.h @@ -22,7 +22,8 @@ #define CGAL_CLASSIFICATION_COLOR_H #include - +#include +#include #include namespace CGAL { diff --git a/Classification/include/CGAL/Classification/Evaluation.h b/Classification/include/CGAL/Classification/Evaluation.h index 9c69b08cd6e..4e97b64bfff 100644 --- a/Classification/include/CGAL/Classification/Evaluation.h +++ b/Classification/include/CGAL/Classification/Evaluation.h @@ -25,6 +25,7 @@ #include #include +#include namespace CGAL { diff --git a/Classification/include/CGAL/Classification/Feature/Distance_to_plane.h b/Classification/include/CGAL/Classification/Feature/Distance_to_plane.h index 9c5b340004f..804a6eceda9 100644 --- a/Classification/include/CGAL/Classification/Feature/Distance_to_plane.h +++ b/Classification/include/CGAL/Classification/Feature/Distance_to_plane.h @@ -23,7 +23,9 @@ #define CGAL_CLASSIFICATION_FEATURE_DISTANCE_TO_PLANE_H #include - +#include +#include +#include #include namespace CGAL { @@ -54,7 +56,7 @@ template class Distance_to_plane : public Feature_base { - typedef typename Kernel_traits::Kernel Kernel; + typedef typename CGAL::Kernel_traits::Kernel Kernel; #ifdef CGAL_CLASSIFICATION_PRECOMPUTE_FEATURES std::vector distance_to_plane_feature; diff --git a/Classification/include/CGAL/Classification/Feature/Echo_scatter.h b/Classification/include/CGAL/Classification/Feature/Echo_scatter.h index 62425abfe75..1cd856166a5 100644 --- a/Classification/include/CGAL/Classification/Feature/Echo_scatter.h +++ b/Classification/include/CGAL/Classification/Feature/Echo_scatter.h @@ -23,8 +23,11 @@ #define CGAL_CLASSIFICATION_FEATURE_ECHO_SCATTER_H #include - +#include +#include +#include #include +#include namespace CGAL { diff --git a/Classification/include/CGAL/Classification/Feature/Eigen.h b/Classification/include/CGAL/Classification/Feature/Eigen.h index 1afa6a425c5..f7151d029c4 100644 --- a/Classification/include/CGAL/Classification/Feature/Eigen.h +++ b/Classification/include/CGAL/Classification/Feature/Eigen.h @@ -24,7 +24,7 @@ #include #include - +#include #include namespace CGAL { diff --git a/Classification/include/CGAL/Classification/Feature/Hsv.h b/Classification/include/CGAL/Classification/Feature/Hsv.h index f5a9bcfa04a..50cbad756a3 100644 --- a/Classification/include/CGAL/Classification/Feature/Hsv.h +++ b/Classification/include/CGAL/Classification/Feature/Hsv.h @@ -26,6 +26,7 @@ #include #include +#include namespace CGAL { diff --git a/Classification/include/CGAL/Classification/Feature/Simple_feature.h b/Classification/include/CGAL/Classification/Feature/Simple_feature.h index 828f7e20f3c..3e21c12ebf2 100644 --- a/Classification/include/CGAL/Classification/Feature/Simple_feature.h +++ b/Classification/include/CGAL/Classification/Feature/Simple_feature.h @@ -24,6 +24,7 @@ #include #include +#include namespace CGAL { diff --git a/Classification/include/CGAL/Classification/Feature/Vertical_dispersion.h b/Classification/include/CGAL/Classification/Feature/Vertical_dispersion.h index 6a68424ec9e..2ba598114fa 100644 --- a/Classification/include/CGAL/Classification/Feature/Vertical_dispersion.h +++ b/Classification/include/CGAL/Classification/Feature/Vertical_dispersion.h @@ -29,6 +29,9 @@ #include #include #include +#include +#include +#include namespace CGAL { diff --git a/Classification/include/CGAL/Classification/Feature/Verticality.h b/Classification/include/CGAL/Classification/Feature/Verticality.h index 54f4ed598fd..4ff0c3fecd2 100644 --- a/Classification/include/CGAL/Classification/Feature/Verticality.h +++ b/Classification/include/CGAL/Classification/Feature/Verticality.h @@ -24,7 +24,7 @@ #include #include - +#include #include namespace CGAL { diff --git a/Classification/include/CGAL/Classification/Feature_set.h b/Classification/include/CGAL/Classification/Feature_set.h index 2c68d4112d0..4170c6e83f5 100644 --- a/Classification/include/CGAL/Classification/Feature_set.h +++ b/Classification/include/CGAL/Classification/Feature_set.h @@ -30,6 +30,7 @@ #endif // CGAL_LINKED_WITH_TBB #include +#include namespace CGAL { diff --git a/Classification/include/CGAL/Classification/Image.h b/Classification/include/CGAL/Classification/Image.h index 27f693ba3aa..6f2f0ed297a 100644 --- a/Classification/include/CGAL/Classification/Image.h +++ b/Classification/include/CGAL/Classification/Image.h @@ -24,6 +24,7 @@ #include #include +#include #define CGAL_CLASSIFICATION_IMAGE_SIZE_LIMIT 100000000 diff --git a/Classification/include/CGAL/Classification/Local_eigen_analysis.h b/Classification/include/CGAL/Classification/Local_eigen_analysis.h index f200ff493d0..238e88c13d1 100644 --- a/Classification/include/CGAL/Classification/Local_eigen_analysis.h +++ b/Classification/include/CGAL/Classification/Local_eigen_analysis.h @@ -30,6 +30,8 @@ #include #include #include +#include +#include #ifdef CGAL_LINKED_WITH_TBB #include @@ -270,21 +272,21 @@ private: if (neighbor_points.size() == 0) { - Eigenvalues v = {{ 0.f, 0.f, 0.f }}; + Eigenvalues v = make_array( 0.f, 0.f, 0.f ); m_eigenvalues[index] = v; - m_centroids[index] = {{ float(query.x()), float(query.y()), float(query.z()) }}; - m_smallest_eigenvectors[index] = {{ 0.f, 0.f, 1.f }}; + m_centroids[index] = make_array(float(query.x()), float(query.y()), float(query.z()) ); + m_smallest_eigenvectors[index] = make_array( 0.f, 0.f, 1.f ); #ifdef CGAL_CLASSIFICATION_EIGEN_FULL_STORAGE - m_middle_eigenvectors[index] = {{ 0.f, 1.f, 0.f }}; - m_largest_eigenvectors[index] = {{ 1.f, 0.f, 0.f }}; + m_middle_eigenvectors[index] = make_array( 0.f, 1.f, 0.f ); + m_largest_eigenvectors[index] = make_array( 1.f, 0.f, 0.f ); #endif return; } Point centroid = CGAL::centroid (neighbor_points.begin(), neighbor_points.end()); - m_centroids[index] = {{ float(centroid.x()), float(centroid.y()), float(centroid.z()) }}; + m_centroids[index] = make_array( float(centroid.x()), float(centroid.y()), float(centroid.z()) ); - CGAL::cpp11::array covariance = {{ 0.f, 0.f, 0.f, 0.f, 0.f, 0.f }}; + CGAL::cpp11::array covariance = make_array( 0.f, 0.f, 0.f, 0.f, 0.f, 0.f ); for (std::size_t i = 0; i < neighbor_points.size(); ++ i) { @@ -297,10 +299,10 @@ private: covariance[5] += float(d.z () * d.z ()); } - CGAL::cpp11::array evalues = {{ 0.f, 0.f, 0.f }}; - CGAL::cpp11::array evectors = {{ 0.f, 0.f, 0.f, + CGAL::cpp11::array evalues = make_array( 0.f, 0.f, 0.f ); + CGAL::cpp11::array evectors = make_array( 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, - 0.f, 0.f, 0.f }}; + 0.f, 0.f, 0.f ); DiagonalizeTraits::diagonalize_selfadjoint_covariance_matrix (covariance, evalues, evectors); @@ -311,11 +313,11 @@ private: for (std::size_t i = 0; i < 3; ++ i) evalues[i] = evalues[i] / sum; m_sum_eigenvalues[index] = float(sum); - m_eigenvalues[index] = {{ float(evalues[0]), float(evalues[1]), float(evalues[2]) }}; - m_smallest_eigenvectors[index] = {{ float(evectors[0]), float(evectors[1]), float(evectors[2]) }}; + m_eigenvalues[index] = make_array( float(evalues[0]), float(evalues[1]), float(evalues[2]) ); + m_smallest_eigenvectors[index] = make_array( float(evectors[0]), float(evectors[1]), float(evectors[2]) ); #ifdef CGAL_CLASSIFICATION_EIGEN_FULL_STORAGE - m_middle_eigenvectors[index] = {{ float(evectors[3]), float(evectors[4]), float(evectors[5]) }}; - m_largest_eigenvectors[index] = {{ float(evectors[6]), float(evectors[7]), float(evectors[8]) }}; + m_middle_eigenvectors[index] = make_array( float(evectors[3]), float(evectors[4]), float(evectors[5]) ); + m_largest_eigenvectors[index] = make_array( float(evectors[6]), float(evectors[7]), float(evectors[8]) ); #endif } diff --git a/Classification/include/CGAL/Classification/OpenCV_random_forest_classifier.h b/Classification/include/CGAL/Classification/OpenCV_random_forest_classifier.h index ffe6a08933a..919481d5172 100644 --- a/Classification/include/CGAL/Classification/OpenCV_random_forest_classifier.h +++ b/Classification/include/CGAL/Classification/OpenCV_random_forest_classifier.h @@ -25,9 +25,13 @@ #include #include - +#if (CV_MAJOR_VERSION < 3) #include #include +#else +#include +#include +#endif namespace CGAL { diff --git a/Classification/include/CGAL/Classification/Point_set_feature_generator.h b/Classification/include/CGAL/Classification/Point_set_feature_generator.h index 006a4885edc..19b416a7fc1 100644 --- a/Classification/include/CGAL/Classification/Point_set_feature_generator.h +++ b/Classification/include/CGAL/Classification/Point_set_feature_generator.h @@ -37,7 +37,7 @@ #include #include #include - +#include #include #include diff --git a/Classification/include/CGAL/Classification/Point_set_neighborhood.h b/Classification/include/CGAL/Classification/Point_set_neighborhood.h index 79977a3eb43..dc59af3c9b0 100644 --- a/Classification/include/CGAL/Classification/Point_set_neighborhood.h +++ b/Classification/include/CGAL/Classification/Point_set_neighborhood.h @@ -33,9 +33,11 @@ #include #include #include +#include #include + namespace CGAL { namespace Classification { diff --git a/Classification/include/CGAL/Classification/Sum_of_weighted_features_classifier.h b/Classification/include/CGAL/Classification/Sum_of_weighted_features_classifier.h index 539cd299ec3..0a59f2778f1 100644 --- a/Classification/include/CGAL/Classification/Sum_of_weighted_features_classifier.h +++ b/Classification/include/CGAL/Classification/Sum_of_weighted_features_classifier.h @@ -27,6 +27,7 @@ #include #include #include +#include #include #include @@ -34,6 +35,8 @@ #include #include #include +#include +#include #ifdef CGAL_LINKED_WITH_TBB #include diff --git a/Classification/include/CGAL/Classification/classify.h b/Classification/include/CGAL/Classification/classify.h index 3e81182d326..2f08bbad185 100644 --- a/Classification/include/CGAL/Classification/classify.h +++ b/Classification/include/CGAL/Classification/classify.h @@ -25,7 +25,7 @@ #include #include - +#include #include #ifdef CGAL_LINKED_WITH_TBB diff --git a/Classification/package_info/Classification/dependencies b/Classification/package_info/Classification/dependencies new file mode 100644 index 00000000000..330b28a88fd --- /dev/null +++ b/Classification/package_info/Classification/dependencies @@ -0,0 +1,21 @@ + +Algebraic_foundations +BGL +Circulator +Classification +Distance_2 +Distance_3 +Installation +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +Point_set_processing_3 +Principal_component_analysis_LGPL +Profiling_tools +Property_map +STL_Extension +Solver_interface +Spatial_searching +Stream_support +Surface_mesh_segmentation diff --git a/Combinatorial_map/package_info/Combinatorial_map/dependencies b/Combinatorial_map/package_info/Combinatorial_map/dependencies new file mode 100644 index 00000000000..5c94bea2054 --- /dev/null +++ b/Combinatorial_map/package_info/Combinatorial_map/dependencies @@ -0,0 +1,22 @@ + +Algebraic_foundations +Arithmetic_kernel +Cartesian_kernel +Circulator +Combinatorial_map +Distance_2 +Distance_3 +Filtered_kernel +Hash_map +Homogeneous_kernel +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Kernel_d +Modular_arithmetic +Number_types +Profiling_tools +STL_Extension +Stream_support diff --git a/Cone_spanners_2/package_info/Cone_spanners_2/dependencies b/Cone_spanners_2/package_info/Cone_spanners_2/dependencies new file mode 100644 index 00000000000..679f3f42508 --- /dev/null +++ b/Cone_spanners_2/package_info/Cone_spanners_2/dependencies @@ -0,0 +1,20 @@ + +Algebraic_foundations +Arithmetic_kernel +CGAL_Core +Cartesian_kernel +Circulator +Cone_spanners_2 +Distance_2 +Distance_3 +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +Polynomial +Profiling_tools +STL_Extension +Stream_support diff --git a/Convex_decomposition_3/package_info/Convex_decomposition_3/dependencies b/Convex_decomposition_3/package_info/Convex_decomposition_3/dependencies new file mode 100644 index 00000000000..14850644d18 --- /dev/null +++ b/Convex_decomposition_3/package_info/Convex_decomposition_3/dependencies @@ -0,0 +1,37 @@ + +Algebraic_foundations +Arithmetic_kernel +BGL +Box_intersection_d +Cartesian_kernel +Circulator +Convex_decomposition_3 +Distance_2 +Distance_3 +Filtered_kernel +HalfedgeDS +Hash_map +Homogeneous_kernel +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Kernel_d +Modifier +Modular_arithmetic +Nef_2 +Nef_3 +Nef_S2 +Number_types +Polygon +Polyhedron +Polyhedron_IO +Profiling_tools +Property_map +STL_Extension +Spatial_sorting +Stream_support +TDS_2 +Triangulation_2 +Union_find diff --git a/Convex_hull_2/package_info/Convex_hull_2/dependencies b/Convex_hull_2/package_info/Convex_hull_2/dependencies new file mode 100644 index 00000000000..2bbf7b7a6ab --- /dev/null +++ b/Convex_hull_2/package_info/Convex_hull_2/dependencies @@ -0,0 +1,11 @@ + +Algebraic_foundations +Convex_hull_2 +Installation +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +Profiling_tools +STL_Extension +Stream_support diff --git a/Convex_hull_3/include/CGAL/convexity_check_3.h b/Convex_hull_3/include/CGAL/convexity_check_3.h index 888df75e3fd..8f35a1a0bf1 100644 --- a/Convex_hull_3/include/CGAL/convexity_check_3.h +++ b/Convex_hull_3/include/CGAL/convexity_check_3.h @@ -29,6 +29,7 @@ #include #include #include +#include namespace CGAL { diff --git a/Convex_hull_3/package_info/Convex_hull_3/dependencies b/Convex_hull_3/package_info/Convex_hull_3/dependencies new file mode 100644 index 00000000000..960afbc0553 --- /dev/null +++ b/Convex_hull_3/package_info/Convex_hull_3/dependencies @@ -0,0 +1,32 @@ + +Algebraic_foundations +Arithmetic_kernel +BGL +Cartesian_kernel +Circulator +Convex_hull_2 +Convex_hull_3 +Distance_2 +Distance_3 +Filtered_kernel +HalfedgeDS +Hash_map +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Modifier +Modular_arithmetic +Number_types +Polyhedron +Polyhedron_IO +Profiling_tools +Property_map +QP_solver +Random_numbers +STL_Extension +Stream_support +TDS_2 +Triangulation_2 +Triangulation_3 diff --git a/Convex_hull_d/package_info/Convex_hull_d/dependencies b/Convex_hull_d/package_info/Convex_hull_d/dependencies new file mode 100644 index 00000000000..60a35d030fd --- /dev/null +++ b/Convex_hull_d/package_info/Convex_hull_d/dependencies @@ -0,0 +1,17 @@ + +Algebraic_foundations +Circulator +Convex_hull_d +Distance_2 +Hash_map +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Kernel_d +Modular_arithmetic +Number_types +Profiling_tools +STL_Extension +Stream_support diff --git a/Distance_2/package_info/Distance_2/dependencies b/Distance_2/package_info/Distance_2/dependencies new file mode 100644 index 00000000000..ac9c45df4b7 --- /dev/null +++ b/Distance_2/package_info/Distance_2/dependencies @@ -0,0 +1,11 @@ + +Algebraic_foundations +Distance_2 +Installation +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +Profiling_tools +STL_Extension +Stream_support diff --git a/Distance_3/package_info/Distance_3/dependencies b/Distance_3/package_info/Distance_3/dependencies new file mode 100644 index 00000000000..3f5ec3f67a2 --- /dev/null +++ b/Distance_3/package_info/Distance_3/dependencies @@ -0,0 +1,10 @@ + +Algebraic_foundations +Distance_2 +Distance_3 +Installation +Kernel_23 +Number_types +Profiling_tools +STL_Extension +Stream_support diff --git a/Documentation/doc/resources/1.8.13/DoxygenLayout.xml b/Documentation/doc/resources/1.8.13/DoxygenLayout.xml index 3d121b28c8d..cbec178b8de 100644 --- a/Documentation/doc/resources/1.8.13/DoxygenLayout.xml +++ b/Documentation/doc/resources/1.8.13/DoxygenLayout.xml @@ -4,7 +4,7 @@ - + diff --git a/Documentation/doc/resources/1.8.13/cgal_stylesheet.css b/Documentation/doc/resources/1.8.13/cgal_stylesheet.css index c424158f467..c3fd5482733 100644 --- a/Documentation/doc/resources/1.8.13/cgal_stylesheet.css +++ b/Documentation/doc/resources/1.8.13/cgal_stylesheet.css @@ -2,6 +2,51 @@ body, table, div, p, dl { font: Lucida Grande,sans-serif; } +.icon-namespace { + font-family: Arial, Helvetica; + font-weight: bold; + font-size: 12px; + height: 14px; + width: 16px; + display: inline-block; + background-color: #FF0000; + color: white; + text-align: center; + border-radius: 4px; + margin-left: 2px; + margin-right: 2px; +} + +.icon-class { + font-family: Arial, Helvetica; + font-weight: bold; + font-size: 12px; + height: 14px; + width: 16px; + display: inline-block; + background-color: #0000FF; + color: white; + text-align: center; + border-radius: 4px; + margin-left: 2px; + margin-right: 2px; +} + +.icon-concept { + font-family: Arial, Helvetica; + font-weight: bold; + font-size: 12px; + height: 14px; + width: 16px; + display: inline-block; + background-color: #67489A; + color: white; + text-align: center; + border-radius: 4px; + margin-left: 2px; + margin-right: 2px; +} + .textsc { font-variant: small-caps; } diff --git a/Documentation/doc/resources/1.8.14/DoxygenLayout.xml b/Documentation/doc/resources/1.8.14/DoxygenLayout.xml index 3d121b28c8d..cbec178b8de 100644 --- a/Documentation/doc/resources/1.8.14/DoxygenLayout.xml +++ b/Documentation/doc/resources/1.8.14/DoxygenLayout.xml @@ -4,7 +4,7 @@ - + diff --git a/Documentation/doc/resources/1.8.14/cgal_stylesheet.css b/Documentation/doc/resources/1.8.14/cgal_stylesheet.css index c424158f467..1707287ecfa 100644 --- a/Documentation/doc/resources/1.8.14/cgal_stylesheet.css +++ b/Documentation/doc/resources/1.8.14/cgal_stylesheet.css @@ -48,6 +48,51 @@ h2 { } +.icon-namespace { + font-family: Arial, Helvetica; + font-weight: bold; + font-size: 12px; + height: 14px; + width: 16px; + display: inline-block; + background-color: #FF0000; + color: white; + text-align: center; + border-radius: 4px; + margin-left: 2px; + margin-right: 2px; +} + +.icon-class { + font-family: Arial, Helvetica; + font-weight: bold; + font-size: 12px; + height: 14px; + width: 16px; + display: inline-block; + background-color: #0000FF; + color: white; + text-align: center; + border-radius: 4px; + margin-left: 2px; + margin-right: 2px; +} + +.icon-concept { + font-family: Arial, Helvetica; + font-weight: bold; + font-size: 12px; + height: 14px; + width: 16px; + display: inline-block; + background-color: #67489A; + color: white; + text-align: center; + border-radius: 4px; + margin-left: 2px; + margin-right: 2px; +} + h1.groupheader { font-size: 150%; } diff --git a/Documentation/doc/resources/1.8.4/DoxygenLayout.xml b/Documentation/doc/resources/1.8.4/DoxygenLayout.xml index 3d121b28c8d..cbec178b8de 100644 --- a/Documentation/doc/resources/1.8.4/DoxygenLayout.xml +++ b/Documentation/doc/resources/1.8.4/DoxygenLayout.xml @@ -4,7 +4,7 @@ - + diff --git a/Documentation/doc/scripts/html_output_post_processing.py b/Documentation/doc/scripts/html_output_post_processing.py index 80c3b8de39e..c2a0b34941f 100755 --- a/Documentation/doc/scripts/html_output_post_processing.py +++ b/Documentation/doc/scripts/html_output_post_processing.py @@ -88,7 +88,7 @@ def clean_doc(): duplicate_files.extend(package_glob('./*/geom.bib')) duplicate_files.extend(package_glob('./*/ftv2cl.png')) duplicate_files.extend(package_glob('./*/ftv2ns.png')) - + for fn in duplicate_files: os.remove(fn) @@ -150,6 +150,15 @@ def rearrange_img(i, dir_name): srcpath=img.attr("src") img.attr("src", "../Manual/" + srcpath.split('/')[-1]) +def rearrange_icon(i, dir_name): + icon = pq(this) + if icon.attr("class") == "icon-class": + parser=pq(this).parent().parent() + for link_class in ['a.el', 'a.elRef']: + links=parser(link_class) + if links.size()>0 and is_concept_file(path.join(dir_name, pq(links[0]).attr("href"))): + icon.attr("class","icon-concept") + ############################################################################### ############################## Figure Numbering ############################### ############################################################################### @@ -232,12 +241,12 @@ def automagically_number_figures(): def main(): parser = argparse.ArgumentParser( - description='''This script makes adjustments to the doxygen output. -It replaces some text in specifically marked classes with the appropriate text for a concept, + description='''This script makes adjustments to the doxygen output. +It replaces some text in specifically marked classes with the appropriate text for a concept, removes some unneeded files, and performs minor repair on some glitches.''') parser.add_argument('--output', metavar='/path/to/doxygen/output', default="output") parser.add_argument('--resources', metavar='/path/to/cgal/Documentation/resources') - + args = parser.parse_args() resources_absdir=args.resources os.chdir(args.output) @@ -252,12 +261,15 @@ removes some unneeded files, and performs minor repair on some glitches.''') annotated_files=package_glob('./*/annotated.html') for fn in annotated_files: + re_replace_in_file("N", "N", fn) + re_replace_in_file("C", "C", fn) dir_name=path.dirname(fn) d = pq(filename=fn, parser='html', encoding='utf-8') tr_tags = d('table.directory tr img') tr_tags.each(lambda i: rearrange_img(i, dir_name)) + span_tags = d('table.directory tr span') + span_tags.each(lambda i: rearrange_icon(i, dir_name)) write_out_html(d,fn) - class_files=list(package_glob('./*/class*.html')) class_files.extend(package_glob('./*/struct*.html')) for fn in class_files: @@ -300,9 +312,11 @@ removes some unneeded files, and performs minor repair on some glitches.''') table("tr").filter(lambda i: re.match(row_id + '*', pq(this).attr('id'))).remove() write_out_html(d, fn) + #Rewrite the code for index trees images + filesjs_files=package_glob('./*/files.js') for fn in filesjs_files: - re_replace_in_file('^.*\[ "Concepts",.*$', '', fn) + re_replace_in_file('^.*\[ "Concepts",.*$', '', fn) #Rewrite the path of some images re_replace_in_file("'src','ftv2", @@ -339,12 +353,12 @@ removes some unneeded files, and performs minor repair on some glitches.''') # remove %CGAL in navtree: this should be a fix in doxygen but for now it does not worth it re_replace_first_in_file('%CGAL','CGAL',glob.glob('./Manual/navtree.js')[0]) clean_doc() - + #remove links to CGAL in the bibliography citelist_files=package_glob('./*/citelist.html') for fn in citelist_files: re_replace_in_file('CGAL', 'CGAL', fn) - + #add a section for Inherits from class_and_struct_files=list(package_glob('./*/class*.html')) class_and_struct_files.extend(package_glob('./*/struct*.html')) diff --git a/Envelope_2/package_info/Envelope_2/dependencies b/Envelope_2/package_info/Envelope_2/dependencies new file mode 100644 index 00000000000..63b7176ecf2 --- /dev/null +++ b/Envelope_2/package_info/Envelope_2/dependencies @@ -0,0 +1,12 @@ + +Algebraic_foundations +Arrangement_on_surface_2 +Envelope_2 +Installation +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +Profiling_tools +STL_Extension +Stream_support diff --git a/Envelope_3/package_info/Envelope_3/dependencies b/Envelope_3/package_info/Envelope_3/dependencies new file mode 100644 index 00000000000..ba0deb8eaba --- /dev/null +++ b/Envelope_3/package_info/Envelope_3/dependencies @@ -0,0 +1,29 @@ + +Algebraic_foundations +Apollonius_graph_2 +Arithmetic_kernel +Arrangement_on_surface_2 +BGL +Cartesian_kernel +Circulator +Distance_2 +Distance_3 +Envelope_3 +Filtered_kernel +HalfedgeDS +Hash_map +Homogeneous_kernel +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Kernel_d +Modular_arithmetic +Number_types +Profiling_tools +Property_map +Random_numbers +STL_Extension +Stream_support +Surface_sweep_2 diff --git a/Filtered_kernel/package_info/Filtered_kernel/dependencies b/Filtered_kernel/package_info/Filtered_kernel/dependencies new file mode 100644 index 00000000000..53f1c89d79c --- /dev/null +++ b/Filtered_kernel/package_info/Filtered_kernel/dependencies @@ -0,0 +1,19 @@ + +Algebraic_foundations +Arithmetic_kernel +Cartesian_kernel +Distance_2 +Distance_3 +Filtered_kernel +Homogeneous_kernel +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Kernel_d +Modular_arithmetic +Number_types +Profiling_tools +STL_Extension +Stream_support diff --git a/Generalized_map/package_info/Generalized_map/dependencies b/Generalized_map/package_info/Generalized_map/dependencies new file mode 100644 index 00000000000..74fab900808 --- /dev/null +++ b/Generalized_map/package_info/Generalized_map/dependencies @@ -0,0 +1,23 @@ + +Algebraic_foundations +Arithmetic_kernel +Cartesian_kernel +Circulator +Combinatorial_map +Distance_2 +Distance_3 +Filtered_kernel +Generalized_map +Hash_map +Homogeneous_kernel +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Kernel_d +Modular_arithmetic +Number_types +Profiling_tools +STL_Extension +Stream_support diff --git a/Generator/package_info/Generator/dependencies b/Generator/package_info/Generator/dependencies new file mode 100644 index 00000000000..d5ae6cfb464 --- /dev/null +++ b/Generator/package_info/Generator/dependencies @@ -0,0 +1,16 @@ + +Algebraic_foundations +BGL +Circulator +Generator +Installation +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +Polygon +Profiling_tools +Property_map +Random_numbers +STL_Extension +Stream_support diff --git a/Geomview/package_info/Geomview/dependencies b/Geomview/package_info/Geomview/dependencies new file mode 100644 index 00000000000..1460e34fbb0 --- /dev/null +++ b/Geomview/package_info/Geomview/dependencies @@ -0,0 +1,11 @@ + +Algebraic_foundations +Circulator +Installation +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +Profiling_tools +STL_Extension +Stream_support diff --git a/GraphicsView/package_info/GraphicsView/dependencies b/GraphicsView/package_info/GraphicsView/dependencies new file mode 100644 index 00000000000..1e515af9597 --- /dev/null +++ b/GraphicsView/package_info/GraphicsView/dependencies @@ -0,0 +1,15 @@ + +Algebraic_foundations +Distance_2 +GraphicsView +Hash_map +Installation +Intersections_2 +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +Profiling_tools +STL_Extension +Stream_support +Triangulation_2 diff --git a/HalfedgeDS/package_info/HalfedgeDS/dependencies b/HalfedgeDS/package_info/HalfedgeDS/dependencies new file mode 100644 index 00000000000..71a9c2a8d6d --- /dev/null +++ b/HalfedgeDS/package_info/HalfedgeDS/dependencies @@ -0,0 +1,13 @@ + +Algebraic_foundations +Circulator +HalfedgeDS +Hash_map +Installation +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +Profiling_tools +STL_Extension +Stream_support diff --git a/Hash_map/package_info/Hash_map/dependencies b/Hash_map/package_info/Hash_map/dependencies new file mode 100644 index 00000000000..8ec25d7e15f --- /dev/null +++ b/Hash_map/package_info/Hash_map/dependencies @@ -0,0 +1,4 @@ + +Hash_map +Installation +STL_Extension diff --git a/Homogeneous_kernel/package_info/Homogeneous_kernel/dependencies b/Homogeneous_kernel/package_info/Homogeneous_kernel/dependencies new file mode 100644 index 00000000000..af6627b3194 --- /dev/null +++ b/Homogeneous_kernel/package_info/Homogeneous_kernel/dependencies @@ -0,0 +1,17 @@ + +Algebraic_foundations +Cartesian_kernel +Distance_2 +Distance_3 +Homogeneous_kernel +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Kernel_d +Modular_arithmetic +Number_types +Profiling_tools +STL_Extension +Stream_support diff --git a/Inscribed_areas/package_info/Inscribed_areas/dependencies b/Inscribed_areas/package_info/Inscribed_areas/dependencies new file mode 100644 index 00000000000..0b51f7eeb6a --- /dev/null +++ b/Inscribed_areas/package_info/Inscribed_areas/dependencies @@ -0,0 +1,16 @@ + +Algebraic_foundations +Circulator +Distance_2 +Inscribed_areas +Installation +Interval_support +Kernel_23 +Matrix_search +Modular_arithmetic +Number_types +Optimisation_basic +Polygon +Profiling_tools +STL_Extension +Stream_support diff --git a/Installation/CMakeLists.txt b/Installation/CMakeLists.txt index 477c6cdb340..2c8c73a9025 100644 --- a/Installation/CMakeLists.txt +++ b/Installation/CMakeLists.txt @@ -1046,16 +1046,23 @@ if ( CGAL_BRANCH_BUILD ) option(CGAL_COMPUTE_DEPENDENCIES "Enable the special targets \"packages_dependencies\", and \"pkg__deps\" for each package. Note that this option will modify the source directory!" - FALSE) + ${CGAL_ENABLE_CHECK_HEADERS}) if(CGAL_ENABLE_CHECK_HEADERS OR CGAL_COMPUTE_DEPENDENCIES) + + option(CGAL_COPY_DEPENDENCIES + "Copy package dependencies in source directories. + Note that this option will modify the source directory!" + FALSE) + if(NOT CMAKE_MAJOR_VERSION GREATER 2) message(FATAL_ERROR "Your version of CMake is too old. You must disable CGAL_ENABLE_CHECK_HEADERS and CGAL_COMPUTE_DEPENDENCIES.") endif() message( "== Setting header checking ==" ) - + find_package(GMP REQUIRED) + find_package(Doxygen REQUIRED) find_package(Eigen3 REQUIRED) find_package(Qt5 COMPONENTS Core Widgets Xml OpenGL REQUIRED) find_package(QGLViewer) @@ -1064,6 +1071,7 @@ You must disable CGAL_ENABLE_CHECK_HEADERS and CGAL_COMPUTE_DEPENDENCIES.") find_package(RS3) find_package(LEDA) find_package(OpenMesh) + find_package(OpenCV QUIET) set(compile_options "\ ${CMAKE_CXX_FLAGS} -DCGAL_EIGEN3_ENABLED \ @@ -1107,9 +1115,14 @@ because IPE_FOUND is false.") set(compile_options "${compile_options} -DCGAL_USE_IPE_7") endif() + if(CGAL_ENABLE_CHECK_HEADERS) + set(falg "-fsyntax-only") + else() + set(falg "-E") + endif() if(NOT DEFINED CGAL_CHECK_SYNTAX_ONLY) execute_process(COMMAND - ${CMAKE_CXX_COMPILER} -x c++ -fsyntax-only ${CGAL_MODULES_DIR}/config/support/test_syntaxonly.cpp + ${CMAKE_CXX_COMPILER} -x c++ ${falg} ${CGAL_MODULES_DIR}/config/support/test_syntaxonly.cpp ERROR_QUIET RESULT_VARIABLE ok) if(ok EQUAL 0) @@ -1120,7 +1133,7 @@ because IPE_FOUND is false.") endif(NOT DEFINED CGAL_CHECK_SYNTAX_ONLY) if(NOT CGAL_CHECK_SYNTAX_ONLY) - message(FATAL_ERROR "Your compiler does not seem to support -fsyntax-only. + message(FATAL_ERROR "Your compiler does not seem to support ${falg}. You must disable CGAL_ENABLE_CHECK_HEADERS and CGAL_COMPUTE_DEPENDENCIES.") endif() @@ -1133,8 +1146,10 @@ You must disable CGAL_ENABLE_CHECK_HEADERS and CGAL_COMPUTE_DEPENDENCIES.") ${VTK_INCLUDE_DIRS} ${LEDA_INCLUDE_DIR} ${OPENMESH_INCLUDE_DIR} + ${OpenCV_INCLUDE_DIRS} ${RS_INCLUDE_DIR} ${EIGEN3_INCLUDE_DIR} + ${GMP_INCLUDE_DIR} ${QGLVIEWER_INCLUDE_DIR} ${Qt5OpenGL_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS} ${Qt5Xml_INCLUDE_DIRS} ${CGAL_3RD_PARTY_INCLUDE_DIRS} ${CGAL_Qt5_3RD_PARTY_INCLUDE_DIRS} @@ -1143,9 +1158,51 @@ You must disable CGAL_ENABLE_CHECK_HEADERS and CGAL_COMPUTE_DEPENDENCIES.") endforeach() include_directories ( SYSTEM ${CGAL_3RD_PARTY_INCLUDE_DIRS} ) - include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/list_of_documented_headers.cmake - OPTIONAL RESULT_VARIABLE has_list_of_documented_headers) - include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/list_of_whitelisted_headers.cmake + # Build the doc + file(MAKE_DIRECTORY "${CMAKE_SOURCE_DIR}/build_doc") + set(DOC_DIR "${CMAKE_SOURCE_DIR}/build_doc") + execute_process(COMMAND "${CMAKE_COMMAND}" -DDOXYGEN_EXECUTABLE=${DOXYGEN_EXECUTABLE} "${CMAKE_SOURCE_DIR}/Documentation/doc" + WORKING_DIRECTORY "${DOC_DIR}" + ) + execute_process(COMMAND "${CMAKE_COMMAND}" --build . --target "doc" + WORKING_DIRECTORY "${DOC_DIR}" ) + + #Get the list of the documented headers + + file(GLOB html_files RELATIVE "${DOC_DIR}/doc_output/" "${DOC_DIR}/doc_output/*/*.html") + file(GLOB example_files RELATIVE "${CMAKE_SOURCE_DIR}/" "${CMAKE_SOURCE_DIR}/*/examples/*/*.cpp") + find_program(AWK awk) + #set(arguments [=[{ match($0, /# *include *(<|[<"])(CGAL\/[^>&]*)([>"]|>)/,arr); if(arr[2]!="") print arr[2] }]=]) + set(arguments [=[{ match($0, /# *include *(<)(CGAL\/[^>&]*)([>"]|>)/,arr); if(arr[2]!="") print arr[2] }]=]) + message("listing headers from html files") + foreach(f ${html_files}) + execute_process(COMMAND "${AWK}" "${arguments}" "${DOC_DIR}/doc_output/${f}" + OUTPUT_VARIABLE tmp_list) + if (NOT "${tmp_list}" STREQUAL "") + string(REPLACE "\n" ";" tmp_list ${tmp_list}) + LIST( APPEND list_of_documented_headers ${tmp_list}) + endif() + endforeach() + message("listing headers from examples files") + foreach(f ${example_files}) + execute_process(COMMAND "${AWK}" "${arguments}" "${CMAKE_SOURCE_DIR}/${f}" + OUTPUT_VARIABLE tmp_list) + if (NOT "${tmp_list}" STREQUAL "") + string(REPLACE "\n" ";" tmp_list ${tmp_list}) + LIST( APPEND list_of_documented_headers ${tmp_list}) + endif() + endforeach() + message("removing duplicates:") + list(REMOVE_DUPLICATES list_of_documented_headers) + message("sorting:") + list(SORT list_of_documented_headers) + #string(REPLACE ";" " \n" list_of_documented_headers "${list_of_documented_headers}") + if (NOT "${list_of_documented_headers}" STREQUAL "") + set(has_list_of_documented_headers TRUE) + else() + set(has_list_of_documented_headers FALSE) + endif() + include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/list_of_whitelisted_headers.cmake OPTIONAL RESULT_VARIABLE has_list_of_whitelisted_headers) message("list_of_whitelisted_headers: ${list_of_whitelisted_headers}") ## Loop on package and headers @@ -1153,6 +1210,8 @@ You must disable CGAL_ENABLE_CHECK_HEADERS and CGAL_COMPUTE_DEPENDENCIES.") if(POLICY CMP0057) cmake_policy(SET CMP0057 NEW) endif() + #get build dir for removal from deps + get_filename_component(BUILD_DIR ${CMAKE_BINARY_DIR} NAME) foreach (package ${CGAL_CONFIGURED_PACKAGES_NAMES}) if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../${package}/include) set(check_pkg_headers_depends "") @@ -1175,7 +1234,7 @@ You must disable CGAL_ENABLE_CHECK_HEADERS and CGAL_COMPUTE_DEPENDENCIES.") if(POLICY CMP0057) if(has_list_of_documented_headers AND NOT header IN_LIST list_of_documented_headers) - message(STATUS "Skip non-documented header \"${header}\".") +# message(STATUS "Skip non-documented header \"${header}\".") set(skip_hdr TRUE) endif() endif() @@ -1216,7 +1275,7 @@ LEDA_FOUND is false.") separate_arguments(CMD UNIX_COMMAND "${CMAKE_CXX_COMPILER} ${compile_options_str} -${include_options_str} -x c++ -fsyntax-only \ +${include_options_str} -x c++ ${falg} \ ${compute_deps_extra_args} \ ${CMAKE_CURRENT_SOURCE_DIR}/../${package}/include/${header}" # The header Algebraic_kernel_rs_gmpz_d_1.h is skipped on purpose: it @@ -1249,6 +1308,8 @@ ${CMAKE_CURRENT_SOURCE_DIR}/../${package}/include/${header}" COMMENT "Compute dependencies of ${package}" COMMAND ${CMAKE_COMMAND} -DCGAL_PACKAGES_PREFIX=${CGAL_SOURCE_DIR} + -DCGAL_COPY_DEPENDENCIES=${CGAL_COPY_DEPENDENCIES} + -DCGAL_COPY_PATH=${CGAL_SOURCE_DIR}/${package}/package_info/${package}/dependencies -DOUTPUT_HEADERS_LIST=${CGAL_BINARY_DIR}/package_info/${package}/included_headers -DOUTPUT_PACKAGES_LIST=${CGAL_BINARY_DIR}/package_info/${package}/dependencies -P "${CGAL_MODULES_DIR}/process_dependencies.cmake" @@ -1274,7 +1335,6 @@ ${CMAKE_CURRENT_SOURCE_DIR}/../${package}/include/${header}" - package_info//check_headers/ (error messages from \ the headers checks)\n") message( "== Setting header checking (DONE) ==\n" ) - endif() endif( CGAL_BRANCH_BUILD ) @@ -1282,3 +1342,4 @@ if(NOT CGAL_BRANCH_BUILD AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/doc") # in a non-branch build this is the top-level CMakeLists.txt add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/doc") endif() + diff --git a/Installation/cmake/modules/CGAL_SetupCGALDependencies.cmake b/Installation/cmake/modules/CGAL_SetupCGALDependencies.cmake index 15e4ae597f8..e32b729b85f 100644 --- a/Installation/cmake/modules/CGAL_SetupCGALDependencies.cmake +++ b/Installation/cmake/modules/CGAL_SetupCGALDependencies.cmake @@ -136,7 +136,11 @@ function(CGAL_setup_CGAL_dependencies target) endif() if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 3) message( STATUS "Using gcc version 4 or later. Adding -frounding-math" ) - target_compile_options(${target} ${keyword} "-frounding-math") + if(CMAKE_VERSION VERSION_LESS 3.3) + target_compile_options(${target} ${keyword} "-frounding-math") + else() + target_compile_options(${target} ${keyword} "$<$:-frounding-math>") + endif() endif() if ( "${GCC_VERSION}" MATCHES "^4.2" ) message( STATUS "Using gcc version 4.2. Adding -fno-strict-aliasing" ) diff --git a/Installation/cmake/modules/list_of_documented_headers.cmake b/Installation/cmake/modules/list_of_documented_headers.cmake deleted file mode 100644 index e01ca994878..00000000000 --- a/Installation/cmake/modules/list_of_documented_headers.cmake +++ /dev/null @@ -1,905 +0,0 @@ -# Generated using ../Scripts/developer_scripts/generate_list_of_documented_headers -set(list_of_documented_headers_txt [=[ -CGAL/AABB_C3T3_triangle_primitive.h -CGAL/AABB_face_graph_triangle_primitive.h -CGAL/AABB_halfedge_graph_segment_primitive.h -CGAL/AABB_intersections.h -CGAL/AABB_polyhedron_segment_primitive.h -CGAL/AABB_polyhedron_triangle_primitive.h -CGAL/AABB_primitive.h -CGAL/AABB_segment_primitive.h -CGAL/AABB_traits.h -CGAL/AABB_tree.h -CGAL/AABB_triangle_primitive.h -CGAL/Advancing_front_surface_reconstruction_cell_base_3.h -CGAL/Advancing_front_surface_reconstruction.h -CGAL/Advancing_front_surface_reconstruction_vertex_base_3.h -CGAL/Aff_transformation_2.h -CGAL/Aff_transformation_3.h -CGAL/aff_transformation_tags.h -CGAL/Algebraic_kernel_d_1.h -CGAL/Algebraic_kernel_d_2.h -CGAL/Algebraic_kernel_for_circles_2_2.h -CGAL/Algebraic_kernel_for_spheres_2_3.h -CGAL/Algebraic_kernel_rs_gmpq_d_1.h -CGAL/Algebraic_kernel_rs_gmpz_d_1.h -CGAL/Algebraic_structure_traits.h -CGAL/algorithm.h -CGAL/all_furthest_neighbors_2.h -CGAL/Alpha_shape_2.h -CGAL/Alpha_shape_3.h -CGAL/Alpha_shape_cell_base_3.h -CGAL/Alpha_shape_face_base_2.h -CGAL/Alpha_shape_vertex_base_2.h -CGAL/Alpha_shape_vertex_base_3.h -CGAL/Apollonius_graph_2.h -CGAL/Apollonius_graph_adaptation_policies_2.h -CGAL/Apollonius_graph_adaptation_traits_2.h -CGAL/Apollonius_graph_filtered_traits_2.h -CGAL/Apollonius_graph_hierarchy_2.h -CGAL/Apollonius_graph_hierarchy_vertex_base_2.h -CGAL/Apollonius_graph_traits_2.h -CGAL/Apollonius_graph_vertex_base_2.h -CGAL/Apollonius_site_2.h -CGAL/approximated_offset_2.h -CGAL/Approximate_min_ellipsoid_d.h -CGAL/Approximate_min_ellipsoid_d_traits_2.h -CGAL/Approximate_min_ellipsoid_d_traits_3.h -CGAL/Approximate_min_ellipsoid_d_traits_d.h -CGAL/Arr_accessor.h -CGAL/Arr_algebraic_segment_traits_2.h -CGAL/Arrangement_2.h -CGAL/Arrangement_on_surface_2.h -CGAL/Arrangement_on_surface_with_history_2.h -CGAL/Arrangement_with_history_2.h -CGAL/array.h -CGAL/Arr_batched_point_location.h -CGAL/Arr_Bezier_curve_traits_2.h -CGAL/Arr_circle_segment_traits_2.h -CGAL/Arr_circular_arc_traits_2.h -CGAL/Arr_circular_line_arc_traits_2.h -CGAL/Arr_conic_traits_2.h -CGAL/Arr_consolidated_curve_data_traits_2.h -CGAL/Arr_counting_traits_2.h -CGAL/Arr_curve_data_traits_2.h -CGAL/Arr_dcel_base.h -CGAL/Arr_default_dcel.h -CGAL/Arr_default_overlay_traits.h -CGAL/Arr_directional_non_caching_segment_basic_traits_2.h -CGAL/Arr_extended_dcel.h -CGAL/Arr_face_index_map.h -CGAL/Arr_geodesic_arc_on_sphere_traits_2.h -CGAL/Arr_landmarks_point_location.h -CGAL/Arr_line_arc_traits_2.h -CGAL/Arr_linear_traits_2.h -CGAL/Arr_naive_point_location.h -CGAL/Arr_non_caching_segment_basic_traits_2.h -CGAL/Arr_non_caching_segment_traits_2.h -CGAL/Arr_observer.h -CGAL/Arr_overlay_2.h -CGAL/Arr_point_location_result.h -CGAL/Arr_polycurve_basic_traits_2.h -CGAL/Arr_polycurve_traits_2.h -CGAL/Arr_polyline_traits_2.h -CGAL/Arr_rational_function_traits_2.h -CGAL/Arr_segment_traits_2.h -CGAL/Arr_simple_point_location.h -CGAL/Arr_spherical_topology_traits_2.h -CGAL/Arr_tags.h -CGAL/Arr_tracing_traits_2.h -CGAL/Arr_trapezoid_ric_point_location.h -CGAL/Arr_vertex_index_map.h -CGAL/Arr_vertical_decomposition_2.h -CGAL/Arr_walk_along_line_point_location.h -CGAL/assertions.h -CGAL/barycenter.h -CGAL/Barycentric_coordinates_2/Discrete_harmonic_2.h -CGAL/Barycentric_coordinates_2/Generalized_barycentric_coordinates_2.h -CGAL/Barycentric_coordinates_2/Mean_value_2.h -CGAL/Barycentric_coordinates_2/Segment_coordinates_2.h -CGAL/Barycentric_coordinates_2/Triangle_coordinates_2.h -CGAL/Barycentric_coordinates_2/Wachspress_2.h -CGAL/Barycentric_mapping_parameterizer_3.h -CGAL/basic.h -CGAL/Bbox_2.h -CGAL/Bbox_3.h -CGAL/bilateral_smooth_point_set.h -CGAL/Boolean_set_operations_2/Gps_default_dcel.h -CGAL/Boolean_set_operations_2.h -CGAL/boost/graph/copy_face_graph.h -CGAL/boost/graph/dijkstra_shortest_paths.h -CGAL/boost/graph/Dual.h -CGAL/boost/graph/Euler_operations.h -CGAL/boost/graph/graph_traits_Delaunay_triangulation_2.h -CGAL/boost/graph/graph_traits_Polyhedron_3.h -CGAL/boost/graph/graph_traits_PolyMesh_ArrayKernelT.h -CGAL/boost/graph/graph_traits_Surface_mesh.h -CGAL/boost/graph/graph_traits_Triangulation_2.h -CGAL/boost/graph/graph_traits_TriMesh_ArrayKernelT.h -CGAL/boost/graph/helpers.h -CGAL/boost/graph/iterator.h -CGAL/boost/graph/properties_Polyhedron_3.h -CGAL/boost/graph/properties_PolyMesh_ArrayKernelT.h -CGAL/boost/graph/properties_Surface_mesh.h -CGAL/boost/graph/split_graph_into_polylines.h -CGAL/Bounded_kernel.h -CGAL/bounding_box.h -CGAL/Box_intersection_d/Box_d.h -CGAL/Box_intersection_d/Box_traits_d.h -CGAL/Box_intersection_d/Box_with_handle_d.h -CGAL/box_intersection_d.h -CGAL/Cartesian_converter.h -CGAL/Cartesian_d.h -CGAL/Cartesian.h -CGAL/Cartesian_matrix.h -CGAL/CC_safe_handle.h -CGAL/Cell_attribute.h -CGAL/Cell_attribute_with_point.h -CGAL/centroid.h -CGAL/CGAL_Ipelet_base.h -CGAL/ch_akl_toussaint.h -CGAL/ch_bykat.h -CGAL/ch_eddy.h -CGAL/ch_graham_andrew.h -CGAL/ch_jarvis.h -CGAL/ch_timing_2.h -CGAL/Circle_2.h -CGAL/Circle_3.h -CGAL/Circular_arc_2.h -CGAL/Circular_arc_3.h -CGAL/Circular_arc_point_2.h -CGAL/Circular_arc_point_3.h -CGAL/Circular_border_parameterizer_3.h -CGAL/Circular_kernel_2.h -CGAL/circulator_bases.h -CGAL/circulator.h -CGAL/Coercion_traits.h -CGAL/Combination_enumerator.h -CGAL/Combinatorial_map_constructors.h -CGAL/Combinatorial_map.h -CGAL/Combinatorial_map_min_items.h -CGAL/Combinatorial_map_operations.h -CGAL/Compact_container.h -CGAL/Compact_mesh_cell_base_3.h -CGAL/Complex_2_in_triangulation_3.h -CGAL/Complexity_tags.h -CGAL/compute_average_spacing.h -CGAL/Compute_cone_boundaries_2.h -CGAL/compute_outer_frame_margin.h -CGAL/Concurrent_compact_container.h -CGAL/config.h -CGAL/connect_holes.h -CGAL/Constrained_Delaunay_triangulation_2.h -CGAL/Constrained_triangulation_2.h -CGAL/Constrained_triangulation_face_base_2.h -CGAL/Constrained_triangulation_plus_2.h -CGAL/constructions_d.h -CGAL/Construct_theta_graph_2.h -CGAL/Construct_yao_graph_2.h -CGAL/convex_decomposition_3.h -CGAL/convex_hull_2.h -CGAL/Convex_hull_3/dual/halfspace_intersection_3.h -CGAL/convex_hull_3.h -CGAL/convex_hull_3_to_polyhedron_3.h -CGAL/convex_hull_constructive_traits_2.h -CGAL/Convex_hull_d.h -CGAL/Convex_hull_d_to_polyhedron_3.h -CGAL/Convex_hull_d_traits_3.h -CGAL/convex_hull_incremental_3.h -CGAL/convex_hull_traits_2.h -CGAL/Convex_hull_traits_3.h -CGAL/CORE_algebraic_number_traits.h -CGAL/CORE_BigFloat.h -CGAL/CORE_BigInt.h -CGAL/CORE_BigRat.h -CGAL/CORE_Expr.h -CGAL/Counting_iterator.h -CGAL/create_offset_polygons_2.h -CGAL/create_offset_polygons_from_polygon_with_holes_2.h -CGAL/create_straight_skeleton_2.h -CGAL/create_straight_skeleton_from_polygon_with_holes_2.h -CGAL/Dart.h -CGAL/Default.h -CGAL/Deformation_Eigen_closest_rotation_traits_3.h -CGAL/Deformation_Eigen_polar_closest_rotation_traits_3.h -CGAL/Delaunay_d.h -CGAL/Delaunay_mesh_criteria_2.h -CGAL/Delaunay_mesher_2.h -CGAL/Delaunay_mesh_face_base_2.h -CGAL/Delaunay_mesh_size_criteria_2.h -CGAL/Delaunay_mesh_vertex_base_2.h -CGAL/Delaunay_triangulation_2.h -CGAL/Delaunay_triangulation_3.h -CGAL/Delaunay_triangulation_adaptation_policies_2.h -CGAL/Delaunay_triangulation_adaptation_traits_2.h -CGAL/Delaunay_triangulation_cell_base_3.h -CGAL/Delaunay_triangulation_cell_base_with_circumcenter_3.h -CGAL/Delaunay_triangulation.h -CGAL/Diagonalize_traits.h -CGAL/Dimension.h -CGAL/Direction_2.h -CGAL/Direction_3.h -CGAL/Discrete_authalic_parameterizer_3.h -CGAL/Discrete_conformal_map_parameterizer_3.h -CGAL/double.h -CGAL/Dynamic_matrix.h -CGAL/edge_aware_upsample_point_set.h -CGAL/Eigen_diagonalize_traits.h -CGAL/Eigen_matrix.h -CGAL/Eigen_solver_traits.h -CGAL/Eigen_svd.h -CGAL/Eigen_vector.h -CGAL/envelope_2.h -CGAL/envelope_3.h -CGAL/Envelope_diagram_1.h -CGAL/Env_plane_traits_3.h -CGAL/Env_sphere_traits_3.h -CGAL/Env_surface_data_traits_3.h -CGAL/Env_triangle_traits_3.h -CGAL/Epick_d.h -CGAL/Euclidean_distance.h -CGAL/Euclidean_distance_sphere_point.h -CGAL/Euler_integrator_2.h -CGAL/Exact_circular_kernel_2.h -CGAL/Exact_integer.h -CGAL/Exact_predicates_exact_constructions_kernel.h -CGAL/Exact_predicates_exact_constructions_kernel_with_kth_root.h -CGAL/Exact_predicates_exact_constructions_kernel_with_root_of.h -CGAL/Exact_predicates_exact_constructions_kernel_with_sqrt.h -CGAL/Exact_predicates_inexact_constructions_kernel.h -CGAL/Exact_rational.h -CGAL/Exact_spherical_kernel_3.h -CGAL/Exponent_vector.h -CGAL/Extended_cartesian.h -CGAL/Extended_homogeneous.h -CGAL/extract_mean_curvature_flow_skeleton.h -CGAL/extremal_polygon_2.h -CGAL/Extremal_polygon_traits_2.h -CGAL/exude_mesh_3.h -CGAL/Filtered_extended_homogeneous.h -CGAL/Filtered_kernel.h -CGAL/Filtered_predicate.h -CGAL/Fixed_alpha_shape_3.h -CGAL/Fixed_alpha_shape_cell_base_3.h -CGAL/Fixed_alpha_shape_vertex_base_3.h -CGAL/Fixed_border_parameterizer_3.h -CGAL/Fourtuple.h -CGAL/FPU.h -CGAL/Fraction_traits.h -CGAL/function_objects.h -CGAL/Fuzzy_iso_box.h -CGAL/Fuzzy_sphere.h -CGAL/General_polygon_2.h -CGAL/General_polygon_set_2.h -CGAL/General_polygon_with_holes_2.h -CGAL/global_functions_circular_kernel_2.h -CGAL/global_functions_circular_kernel_3.h -CGAL/global_functions_spherical_kernel_3.h -CGAL/Gmpfi.h -CGAL/Gmpfr.h -CGAL/Gmpq.h -CGAL/gmpxx.h -CGAL/Gmpzf.h -CGAL/Gmpz.h -CGAL/gnuplot_output_2.h -CGAL/Gps_circle_segment_traits_2.h -CGAL/Gps_segment_traits_2.h -CGAL/Gps_traits_2.h -CGAL/grabbers.h -CGAL/graph_traits_Arrangement_2.h -CGAL/graph_traits_Dual_Arrangement_2.h -CGAL/Gray_image_mesh_domain_3.h -CGAL/Gray_level_image_3.h -CGAL/grid_simplify_point_set.h -CGAL/HalfedgeDS_bases.h -CGAL/HalfedgeDS_const_decorator.h -CGAL/HalfedgeDS_decorator.h -CGAL/HalfedgeDS_default.h -CGAL/HalfedgeDS_face_base.h -CGAL/HalfedgeDS_face_max_base_with_id.h -CGAL/HalfedgeDS_face_min_base.h -CGAL/HalfedgeDS_halfedge_base.h -CGAL/HalfedgeDS_halfedge_max_base_with_id.h -CGAL/HalfedgeDS_halfedge_min_base.h -CGAL/HalfedgeDS_items_2.h -CGAL/HalfedgeDS_items_decorator.h -CGAL/HalfedgeDS_list.h -CGAL/HalfedgeDS_min_items.h -CGAL/HalfedgeDS_vector.h -CGAL/HalfedgeDS_vertex_base.h -CGAL/HalfedgeDS_vertex_max_base_with_id.h -CGAL/HalfedgeDS_vertex_min_base.h -CGAL/Handle_hash_function.h -CGAL/hierarchy_simplify_point_set.h -CGAL/Hilbert_policy_tags.h -CGAL/Hilbert_sort_2.h -CGAL/Hilbert_sort_3.h -CGAL/Hilbert_sort_d.h -CGAL/hilbert_sort.h -CGAL/Hilbert_sort_on_sphere_3.h -CGAL/hilbert_sort_on_sphere.h -CGAL/Homogeneous_converter.h -CGAL/Homogeneous_d.h -CGAL/Homogeneous.h -CGAL/Identity_policy_2.h -CGAL/Image_3.h -CGAL/ImageIO.h -CGAL/Implicit_mesh_domain_3.h -CGAL/Implicit_surface_3.h -CGAL/Implicit_to_labeling_function_wrapper.h -CGAL/import_from_triangulation_2.h -CGAL/import_from_triangulation_3.h -CGAL/Incremental_neighbor_search.h -CGAL/In_place_list.h -CGAL/internal/Combination_enumerator.h -CGAL/internal/Exact_type_selector.h -CGAL/internal/Polyhedron_plane_clipping_3.h -CGAL/interpolation_functions.h -CGAL/Interpolation_gradient_fitting_traits_2.h -CGAL/Interpolation_traits_2.h -CGAL/intersection_of_Polyhedra_3.h -CGAL/intersection_of_Polyhedra_3_refinement_visitor.h -CGAL/intersections_d.h -CGAL/intersections.h -CGAL/Interval_nt.h -CGAL/Interval_skip_list.h -CGAL/Interval_skip_list_interval.h -CGAL/IO/Arr_iostream.h -CGAL/IO/Arr_text_formatter.h -CGAL/IO/Arr_with_history_iostream.h -CGAL/IO/Arr_with_history_text_formatter.h -CGAL/IO/Color.h -CGAL/IO/Complex_2_in_triangulation_3_file_writer.h -CGAL/IO/Dxf_bsop_reader.h -CGAL/IO/File_medit.h -CGAL/IO/File_scanner_OFF.h -CGAL/IO/File_writer_inventor.h -CGAL/IO/File_writer_OFF.h -CGAL/IO/File_writer_VRML_2.h -CGAL/IO/File_writer_wavefront.h -CGAL/IO/generic_copy_OFF.h -CGAL/IO/Geomview_stream.h -CGAL/IO/Inventor_ostream.h -CGAL/IO/io.h -CGAL/IO/Istream_iterator.h -CGAL/IO/Nef_polyhedron_iostream_3.h -CGAL/IO/OFF_reader.h -CGAL/IO/Ostream_iterator.h -CGAL/IO/output_surface_facets_to_polyhedron.h -CGAL/IO/Polyhedron_geomview_ostream.h -CGAL/IO/Polyhedron_inventor_ostream.h -CGAL/IO/Polyhedron_iostream.h -CGAL/IO/Polyhedron_VRML_1_ostream.h -CGAL/IO/Polyhedron_VRML_2_ostream.h -CGAL/IO/read_off_points.h -CGAL/IO/read_ply_points.h -CGAL/IO/read_xyz_points.h -CGAL/IO/Triangulation_geomview_ostream_2.h -CGAL/IO/Triangulation_geomview_ostream_3.h -CGAL/IO/Verbose_ostream.h -CGAL/IO/VRML_1_ostream.h -CGAL/IO/VRML_2_ostream.h -CGAL/IO/write_xyz_points.h -CGAL/Iso_cuboid_3.h -CGAL/Iso_rectangle_2.h -CGAL/iterator.h -CGAL/Iterator_range.h -CGAL/jet_estimate_normals.h -CGAL/jet_smooth_point_set.h -CGAL/Join_input_iterator.h -CGAL/Kd_tree.h -CGAL/Kd_tree_node.h -CGAL/Kd_tree_rectangle.h -CGAL/Kernel_d/Aff_transformation_d.h -CGAL/Kernel_d/Direction_d.h -CGAL/Kernel_d/Hyperplane_d.h -CGAL/Kernel_d/Iso_box_d.h -CGAL/Kernel_d/Line_d.h -CGAL/Kernel_d/Point_d.h -CGAL/Kernel_d/Ray_d.h -CGAL/Kernel_d/Segment_d.h -CGAL/Kernel_d/Sphere_d.h -CGAL/Kernel_d/Vector_d.h -CGAL/Kernel/global_functions.h -CGAL/Kernel_traits.h -CGAL/Kinetic/Active_objects_listener_helper.h -CGAL/Kinetic/Active_objects_vector.h -CGAL/Kinetic/basic.h -CGAL/Kinetic/Cartesian.h -CGAL/Kinetic/Certificate_generator.h -CGAL/Kinetic/Default_instantaneous_kernel.h -CGAL/Kinetic/Default_simulator.h -CGAL/Kinetic/Delaunay_triangulation_2.h -CGAL/Kinetic/Delaunay_triangulation_3.h -CGAL/Kinetic/Delaunay_triangulation_cell_base_3.h -CGAL/Kinetic/Delaunay_triangulation_event_log_visitor_2.h -CGAL/Kinetic/Delaunay_triangulation_event_log_visitor_3.h -CGAL/Kinetic/Delaunay_triangulation_face_base_2.h -CGAL/Kinetic/Delaunay_triangulation_recent_edges_visitor_2.h -CGAL/Kinetic/Delaunay_triangulation_visitor_base_2.h -CGAL/Kinetic/Delaunay_triangulation_visitor_base_3.h -CGAL/Kinetic/Enclosing_box_2.h -CGAL/Kinetic/Enclosing_box_3.h -CGAL/Kinetic/Erase_event.h -CGAL/Kinetic/Event_base.h -CGAL/Kinetic/Exact_simulation_traits.h -CGAL/Kinetic/Handle_degeneracy_function_kernel.h -CGAL/Kinetic/Heap_pointer_event_queue.h -CGAL/Kinetic/Inexact_simulation_traits.h -CGAL/Kinetic/Insert_event.h -CGAL/Kinetic/Listener.h -CGAL/Kinetic/listeners.h -CGAL/Kinetic/Multi_listener.h -CGAL/Kinetic/Ref_counted.h -CGAL/Kinetic/Regular_triangulation_3.h -CGAL/Kinetic/Regular_triangulation_cell_base_3.h -CGAL/Kinetic/Regular_triangulation_event_log_visitor_3.h -CGAL/Kinetic/Regular_triangulation_exact_simulation_traits.h -CGAL/Kinetic/Regular_triangulation_instantaneous_kernel.h -CGAL/Kinetic/Regular_triangulation_vertex_base_3.h -CGAL/Kinetic/Regular_triangulation_visitor_base_3.h -CGAL/Kinetic/Simulator_kds_listener.h -CGAL/Kinetic/Simulator_objects_listener.h -CGAL/Kinetic/Sort_event_log_visitor.h -CGAL/Kinetic/Sort.h -CGAL/Kinetic/Sort_visitor_base.h -CGAL/Kinetic/Two_list_pointer_event_queue.h -CGAL/K_neighbor_search.h -CGAL/Labeled_image_mesh_domain_3.h -CGAL/Labeled_mesh_domain_3.h -CGAL/Largest_empty_iso_rectangle_2.h -CGAL/Lazy_exact_nt.h -CGAL/leda_bigfloat.h -CGAL/leda_integer.h -CGAL/leda_rational.h -CGAL/leda_real.h -CGAL/Level_interval.h -CGAL/Line_2.h -CGAL/Line_3.h -CGAL/Linear_algebraCd.h -CGAL/Linear_algebraHd.h -CGAL/Line_arc_2.h -CGAL/Line_arc_3.h -CGAL/Linear_cell_complex_constructors.h -CGAL/Linear_cell_complex.h -CGAL/Linear_cell_complex_min_items.h -CGAL/Linear_cell_complex_operations.h -CGAL/Linear_cell_complex_traits.h -CGAL/linear_least_squares_fitting_2.h -CGAL/linear_least_squares_fitting_3.h -CGAL/lloyd_optimize_mesh_2.h -CGAL/Location_policy.h -CGAL/LSCM_parameterizer_3.h -CGAL/make_mesh_3.h -CGAL/make_piecewise_smooth_surface_mesh.h -CGAL/make_skin_surface_mesh_3.h -CGAL/make_surface_mesh.h -CGAL/Manhattan_distance_iso_box_point.h -CGAL/Mean_curvature_flow_skeletonization.h -CGAL/Mean_value_coordinates_parameterizer_3.h -CGAL/memory.h -CGAL/Memory_sizer.h -CGAL/Mesh_3/dihedral_angle_3.h -CGAL/Mesh_3/Dump_c3t3.h -CGAL/Mesh_3/implicit_to_labeled_function_wrapper.h -CGAL/Mesh_3/initialize_triangulation_from_labeled_image.h -CGAL/Mesh_3/Labeled_mesh_domain_3.h -CGAL/Mesh_3/polyhedral_to_labeled_function_wrapper.h -CGAL/Mesh_3/polylines_to_protect.h -CGAL/Mesh_3/search_for_connected_components_in_labeled_image.h -CGAL/Mesh_3/squared_distance_Point_3_Triangle_3.h -CGAL/Mesh_cell_base_3.h -CGAL/Mesh_cell_criteria_3.h -CGAL/Mesh_complex_3_in_triangulation_3.h -CGAL/Mesh_constant_domain_field_3.h -CGAL/Mesh_criteria_3.h -CGAL/Mesh_domain_with_polyline_features_3.h -CGAL/Mesh_edge_criteria_3.h -CGAL/Mesh_facet_criteria_3.h -CGAL/Mesh_polyhedron_3.h -CGAL/mesh_segmentation.h -CGAL/mesh_skin_surface_3.h -CGAL/Mesh_triangulation_3.h -CGAL/mesh_union_of_balls_3.h -CGAL/Mesh_vertex_base_3.h -CGAL/Min_annulus_d.h -CGAL/Min_circle_2.h -CGAL/Min_circle_2_traits_2.h -CGAL/Min_ellipse_2.h -CGAL/Min_ellipse_2_traits_2.h -CGAL/minkowski_sum_2.h -CGAL/minkowski_sum_3.h -CGAL/min_quadrilateral_2.h -CGAL/Min_quadrilateral_traits_2.h -CGAL/Min_sphere_annulus_d_traits_2.h -CGAL/Min_sphere_annulus_d_traits_3.h -CGAL/Min_sphere_annulus_d_traits_d.h -CGAL/Min_sphere_d.h -CGAL/Min_sphere_of_points_d_traits_2.h -CGAL/Min_sphere_of_points_d_traits_3.h -CGAL/Min_sphere_of_points_d_traits_d.h -CGAL/Min_sphere_of_spheres_d.h -CGAL/Min_sphere_of_spheres_d_traits_2.h -CGAL/Min_sphere_of_spheres_d_traits_3.h -CGAL/Min_sphere_of_spheres_d_traits_d.h -CGAL/Modifier_base.h -CGAL/Modular_traits.h -CGAL/Monge_via_jet_fitting.h -CGAL/MP_Float.h -CGAL/Mpzf.h -CGAL/mst_orient_normals.h -CGAL/Multiscale_sort.h -CGAL/Multiset.h -CGAL/natural_neighbor_coordinates_2.h -CGAL/natural_neighbor_coordinates_3.h -CGAL/Nef_3/Polygon_constructor.h -CGAL/Nef_3/SNC_indexed_items.h -CGAL/Nef_nary_union_3.h -CGAL/Nef_polyhedron_2.h -CGAL/Nef_polyhedron_3.h -CGAL/Nef_polyhedron_S2.h -CGAL/Nef_S2/create_random_Nef_S2.h -CGAL/N_step_adaptor.h -CGAL/NT_converter.h -CGAL/Number_type_checker.h -CGAL/number_utils.h -CGAL/Object.h -CGAL/offset_polygon_2.h -CGAL/OFF_to_nef_3.h -CGAL/OpenNL/linear_solver.h -CGAL/Optimal_transportation_reconstruction_2.h -CGAL/optimisation\_assertions.h -CGAL/Origin.h -CGAL/Orthogonal_incremental_neighbor_search.h -CGAL/Orthogonal_k_neighbor_search.h -CGAL/Parameterization_mesh_feature_extractor.h -CGAL/Parameterization_mesh_patch_3.h -CGAL/Parameterization_polyhedron_adaptor_3.h -CGAL/parameterize.h -CGAL/Parameterizer_traits_3.h -CGAL/partition_2.h -CGAL/Partition_is_valid_traits_2.h -CGAL/Partition_traits_2.h -CGAL/pca_estimate_normals.h -CGAL/Periodic_2_Delaunay_triangulation_2.h -CGAL/Periodic_2_Delaunay_triangulation_traits_2.h -CGAL/Periodic_2_offset_2.h -CGAL/Periodic_2_triangulation_2.h -CGAL/Periodic_2_triangulation_face_base_2.h -CGAL/Periodic_2_triangulation_filtered_traits_2.h -CGAL/Periodic_2_triangulation_hierarchy_2.h -CGAL/Periodic_2_triangulation_hierarchy_vertex_base_2.h -CGAL/Periodic_2_triangulation_traits_2.h -CGAL/Periodic_2_triangulation_vertex_base_2.h -CGAL/Periodic_3_Delaunay_triangulation_3.h -CGAL/Periodic_3_Delaunay_triangulation_traits_3.h -CGAL/Periodic_3_offset_3.h -CGAL/Periodic_3_triangulation_3.h -CGAL/Periodic_3_triangulation_ds_cell_base_3.h -CGAL/Periodic_3_triangulation_ds_vertex_base_3.h -CGAL/Periodic_3_triangulation_filtered_traits_3.h -CGAL/Periodic_3_triangulation_hierarchy_3.h -CGAL/Periodic_3_triangulation_traits_3.h -CGAL/perturb_mesh_3.h -CGAL/Piecewise_smooth_surface_mesh_default_edges_criteria_3.h -CGAL/Plane_3.h -CGAL/Plane_separator.h -CGAL/Point_2.h -CGAL/Point_3.h -CGAL/Point_container.h -CGAL/point_generators_2.h -CGAL/point_generators_3.h -CGAL/point_generators_d.h -CGAL/Point_set_2.h -CGAL/Point_with_normal_3.h -CGAL/Poisson_implicit_surface_3.h -CGAL/Poisson_reconstruction_function.h -CGAL/Polygon_2_algorithms.h -CGAL/Polygon_2.h -CGAL/Polygon_convex_decomposition_2.h -CGAL/polygon_function_objects.h -CGAL/Polygon_mesh_processing/border.h -CGAL/Polygon_mesh_processing/compute_normal.h -CGAL/Polygon_mesh_processing/connected_components.h -CGAL/Polygon_mesh_processing/fair.h -CGAL/Polygon_mesh_processing/orientation.h -CGAL/Polygon_mesh_processing/orient_polygon_soup.h -CGAL/Polygon_mesh_processing/polygon_soup_to_polygon_mesh.h -CGAL/Polygon_mesh_processing/refine.h -CGAL/Polygon_mesh_processing/remesh.h -CGAL/Polygon_mesh_processing/repair.h -CGAL/Polygon_mesh_processing/self_intersections.h -CGAL/Polygon_mesh_processing/stitch_borders.h -CGAL/Polygon_mesh_processing/triangulate_faces.h -CGAL/Polygon_mesh_processing/triangulate_hole.h -CGAL/Polygon_mesh_slicer.h -CGAL/Polygon_nop_decomposition_2.h -CGAL/Polygon_offset_builder_2.h -CGAL/Polygon_offset_builder_traits_2.h -CGAL/Polygon_set_2.h -CGAL/Polygon_triangulation_decomposition_2.h -CGAL/Polygon_vertical_decomposition_2.h -CGAL/Polygon_with_holes_2.h -CGAL/Polyhedral_mesh_domain_3.h -CGAL/Polyhedral_mesh_domain_with_features_3.h -CGAL/Polyhedral_surface_3.h -CGAL/Polyhedron_3.h -CGAL/polyhedron_cut_plane_3.h -CGAL/Polyhedron_incremental_builder_3.h -CGAL/Polyhedron_items_3.h -CGAL/Polyhedron_items_with_id_3.h -CGAL/Polyhedron_min_items_3.h -CGAL/Polyhedron_traits_3.h -CGAL/Polyhedron_traits_with_normals_3.h -CGAL/Polyline_simplification_2/Hybrid_squared_distance_cost.h -CGAL/Polyline_simplification_2/Scaled_squared_distance_cost.h -CGAL/Polyline_simplification_2/simplify.h -CGAL/Polyline_simplification_2/Squared_distance_cost.h -CGAL/Polyline_simplification_2/Stop_above_cost_threshold.h -CGAL/Polyline_simplification_2/Stop_below_count_ratio_threshold.h -CGAL/Polyline_simplification_2/Stop_below_count_threshold.h -CGAL/Polyline_simplification_2/Vertex_base_2.h -CGAL/Polynomial.h -CGAL/Polynomial/internal/GSL_numeric_solver.h -CGAL/Polynomial/internal/numeric_solvers.h -CGAL/Polynomial/Kernel.h -CGAL/Polynomial/Numeric_root_stack.h -CGAL/Polynomial/polynomial_converters.h -CGAL/Polynomial/Polynomial.h -CGAL/Polynomial/Root_stack_default_traits.h -CGAL/Polynomials_1_2.h -CGAL/Polynomials_1_3.h -CGAL/Polynomials_2_2.h -CGAL/Polynomials_2_3.h -CGAL/Polynomials_for_line_3.h -CGAL/Polynomial/Sturm_root_stack.h -CGAL/Polynomial/Sturm_root_stack_traits.h -CGAL/Polynomial_traits_d.h -CGAL/Polynomial_type_generator.h -CGAL/Polytope_distance_d.h -CGAL/Polytope_distance_d_traits_2.h -CGAL/Polytope_distance_d_traits_3.h -CGAL/Polytope_distance_d_traits_d.h -CGAL/Profile_counter.h -CGAL/Profile_timer.h -CGAL/Projection_traits_xy_3.h -CGAL/Projection_traits_xz_3.h -CGAL/Projection_traits_yz_3.h -CGAL/property_map.h -CGAL/QP_functions.h -CGAL/QP_models.h -CGAL/QP_options.h -CGAL/QP_solution.h -CGAL/Qt/CircularArcGraphicsItem.h -CGAL/Qt/ConstrainedTriangulationGraphicsItem.h -CGAL/Qt/Converter.h -CGAL/Qt/GraphicsItem.h -CGAL/Qt/GraphicsViewCircleInput.h -CGAL/Qt/GraphicsViewCircularArcInput.h -CGAL/Qt/GraphicsViewInput.h -CGAL/Qt/GraphicsViewIsoRectangleInput.h -CGAL/Qt/GraphicsViewNavigation.h -CGAL/Qt/GraphicsViewPolylineInput.h -CGAL/Qt/PainterOstream.h -CGAL/Qt/TriangulationGraphicsItem.h -CGAL/Qt/VoronoiGraphicsItem.h -CGAL/Quotient.h -CGAL/random_convex_hull_in_disc_2.h -CGAL/random_convex_set_2.h -CGAL/Random_convex_set_traits_2.h -CGAL/Random.h -CGAL/random_polygon_2.h -CGAL/random_selection.h -CGAL/random_simplify_point_set.h -CGAL/Range_segment_tree_traits.h -CGAL/Range_tree_d.h -CGAL/Range_tree_k.h -CGAL/Rational_traits.h -CGAL/Ray_2.h -CGAL/Ray_3.h -CGAL/read_vtk_image_data.h -CGAL/Real_embeddable_traits.h -CGAL/Real_timer.h -CGAL/rectangular_p_center_2.h -CGAL/refine_mesh_3.h -CGAL/Regular_grid_2.h -CGAL/regularize_planes.h -CGAL/regular_neighbor_coordinates_2.h -CGAL/Regular_triangulation_2.h -CGAL/Regular_triangulation_3.h -CGAL/Regular_triangulation_adaptation_policies_2.h -CGAL/Regular_triangulation_adaptation_traits_2.h -CGAL/Regular_triangulation_cell_base_3.h -CGAL/Regular_triangulation_cell_base_with_weighted_circumcenter_3.h -CGAL/Regular_triangulation_euclidean_traits_2.h -CGAL/Regular_triangulation_euclidean_traits_3.h -CGAL/Regular_triangulation_face_base_2.h -CGAL/Regular_triangulation_filtered_traits_2.h -CGAL/Regular_triangulation_vertex_base_2.h -CGAL/remove_outliers.h -CGAL/Residue.h -CGAL/result_of.h -CGAL/Ridges.h -CGAL/Root_for_circles_2_2.h -CGAL/Root_for_spheres_2_3.h -CGAL/Root_of_traits.h -CGAL/Rotational_sweep_visibility_2.h -CGAL/Runge_kutta_integrator_2.h -CGAL/Scale_space_surface_reconstruction_3.h -CGAL/Search_traits_2.h -CGAL/Search_traits_3.h -CGAL/Search_traits_adapter.h -CGAL/Search_traits_d.h -CGAL/Search_traits.h -CGAL/Segment_2.h -CGAL/Segment_3.h -CGAL/Segment_Delaunay_graph_2.h -CGAL/Segment_Delaunay_graph_adaptation_policies_2.h -CGAL/Segment_Delaunay_graph_adaptation_traits_2.h -CGAL/Segment_Delaunay_graph_filtered_traits_2.h -CGAL/Segment_Delaunay_graph_hierarchy_2.h -CGAL/Segment_Delaunay_graph_hierarchy_vertex_base_2.h -CGAL/Segment_Delaunay_graph_Linf_2.h -CGAL/Segment_Delaunay_graph_Linf_filtered_traits_2.h -CGAL/Segment_Delaunay_graph_Linf_hierarchy_2.h -CGAL/Segment_Delaunay_graph_Linf_traits_2.h -CGAL/Segment_Delaunay_graph_site_2.h -CGAL/Segment_Delaunay_graph_storage_site_2.h -CGAL/Segment_Delaunay_graph_storage_traits_with_info_2.h -CGAL/Segment_Delaunay_graph_traits_2.h -CGAL/Segment_Delaunay_graph_vertex_base_2.h -CGAL/Segment_tree_d.h -CGAL/Segment_tree_k.h -CGAL/Shape_detection_3/Cone.h -CGAL/Shape_detection_3/Cylinder.h -CGAL/Shape_detection_3/Efficient_RANSAC.h -CGAL/Shape_detection_3/Shape_detection_traits.h -CGAL/Shape_detection_3.h -CGAL/Shape_detection_3/Plane.h -CGAL/Shape_detection_3/Shape_base.h -CGAL/Shape_detection_3/Sphere.h -CGAL/Shape_detection_3/Torus.h -CGAL/sibson_gradient_fitting.h -CGAL/Side_of_triangle_mesh.h -CGAL/Simple_cartesian.h -CGAL/Simple_homogeneous.h -CGAL/Simple_polygon_visibility_2.h -CGAL/Sixtuple.h -CGAL/Skin_surface_3.h -CGAL/Skin_surface_polyhedral_items_3.h -CGAL/Skin_surface_traits_3.h -CGAL/Small_side_angle_bisector_decomposition_2.h -CGAL/Snap_rounding_2.h -CGAL/Snap_rounding_traits_2.h -CGAL/sorted_matrix_search.h -CGAL/Sorted_matrix_search_traits_adaptor.h -CGAL/Spatial_lock_grid_3.h -CGAL/spatial_sort.h -CGAL/spatial_sort_on_sphere.h -CGAL/Spatial_sort_traits_adapter_2.h -CGAL/Spatial_sort_traits_adapter_3.h -CGAL/Spatial_sort_traits_adapter_d.h -CGAL/Sphere_3.h -CGAL/Spherical_kernel_3.h -CGAL/Splitters.h -CGAL/Sqrt_extension.h -CGAL/Square_border_parameterizer_3.h -CGAL/squared_distance_2.h -CGAL/squared_distance_3.h -CGAL/Straight_skeleton_2.h -CGAL/Straight_skeleton_builder_2.h -CGAL/Straight_skeleton_builder_traits_2.h -CGAL/Straight_skeleton_converter_2.h -CGAL/Straight_skeleton_face_base_2.h -CGAL/Straight_skeleton_halfedge_base_2.h -CGAL/Straight_skeleton_vertex_base_2.h -CGAL/Stream_lines_2.h -CGAL/subdivide_skin_surface_mesh_3.h -CGAL/subdivide_union_of_balls_mesh_3.h -CGAL/Subdivision_mask_3.h -CGAL/Subdivision_method_3.h -CGAL/Surface_mesh_cell_base_3.h -CGAL/Surface_mesh_complex_2_in_triangulation_3.h -CGAL/Surface_mesh_default_criteria_3.h -CGAL/Surface_mesh_default_triangulation_3.h -CGAL/Surface_mesh_deformation.h -CGAL/Surface_mesh.h -CGAL/Surface_mesh_shortest_path.h -CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path.h -CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path_traits.h -CGAL/Surface_mesh_simplification/edge_collapse.h -CGAL/Surface_mesh_simplification/Edge_collapse_visitor_base.h -CGAL/Surface_mesh_simplification/HalfedgeGraph_Polyhedron_3.h -CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Constrained_placement.h -CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Count_ratio_stop_predicate.h -CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Count_stop_predicate.h -CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Edge_length_cost.h -CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Edge_profile.h -CGAL/Surface_mesh_simplification/Policies/Edge_collapse/LindstromTurk_cost.h -CGAL/Surface_mesh_simplification/Policies/Edge_collapse/LindstromTurk_placement.h -CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Midpoint_and_length.h -CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Midpoint_placement.h -CGAL/Surface_mesh/Surface_mesh.h -CGAL/Surface_mesh_traits_generator_3.h -CGAL/Surface_mesh_vertex_base_3.h -CGAL/surface_neighbor_coordinates_3.h -CGAL/Surface_Sweep_2_algorithms.h -CGAL/tags.h -CGAL/Taucs_solver_traits.h -CGAL/Tetrahedron_3.h -CGAL/Three/Polyhedron_demo_io_plugin_interface.h -CGAL/Three/Polyhedron_demo_plugin_helper.h -CGAL/Three/Polyhedron_demo_plugin_interface.h -CGAL/Three/Scene_group_item.h -CGAL/Three/Scene_interface.h -CGAL/Three/Scene_item.h -CGAL/Three/Scene_print_interface_item.h -CGAL/Three/TextRenderer.h -CGAL/Threetuple.h -CGAL/Three/Viewer_interface.h -CGAL/Timer.h -CGAL/trace.h -CGAL/Tree_base.h -CGAL/Tree_traits.h -CGAL/Triangle_2.h -CGAL/Triangle_3.h -CGAL/Triangle_accessor_3.h -CGAL/Triangular_expansion_visibility_2.h -CGAL/Triangular_field_2.h -CGAL/Triangulation_2_filtered_projection_traits_3.h -CGAL/Triangulation_2.h -CGAL/Triangulation_3.h -CGAL/Triangulation_cell_base_3.h -CGAL/Triangulation_cell_base_with_circumcenter_3.h -CGAL/Triangulation_cell_base_with_info_3.h -CGAL/Triangulation_conformer_2.h -CGAL/Triangulation_data_structure_2.h -CGAL/Triangulation_data_structure_3.h -CGAL/Triangulation_data_structure.h -CGAL/Triangulation_ds_cell_base_3.h -CGAL/Triangulation_ds_face_base_2.h -CGAL/Triangulation_ds_full_cell.h -CGAL/Triangulation_ds_vertex_base_2.h -CGAL/Triangulation_ds_vertex_base_3.h -CGAL/Triangulation_ds_vertex.h -CGAL/Triangulation_euclidean_traits_2.h -CGAL/Triangulation_face_base_2.h -CGAL/Triangulation_face_base_with_info_2.h -CGAL/Triangulation_face.h -CGAL/Triangulation_full_cell.h -CGAL/Triangulation.h -CGAL/Triangulation_hierarchy_2.h -CGAL/Triangulation_simplex_3.h -CGAL/Triangulation_utils_3.h -CGAL/Triangulation_vertex_base_2.h -CGAL/Triangulation_vertex_base_3.h -CGAL/Triangulation_vertex_base_with_id_2.h -CGAL/Triangulation_vertex_base_with_info_2.h -CGAL/Triangulation_vertex_base_with_info_3.h -CGAL/Triangulation_vertex.h -CGAL/tuple.h -CGAL/Twotuple.h -CGAL/Two_vertices_parameterizer_3.h -CGAL/Umbilics.h -CGAL/Uncertain.h -CGAL/Union_find.h -CGAL/Union_of_balls_3.h -CGAL/Unique_hash_map.h -CGAL/use.h -CGAL/utility.h -CGAL/utils_classes.h -CGAL/value_type_traits.h -CGAL/vcm_estimate_edges.h -CGAL/vcm_estimate_normals.h -CGAL/Vector_2.h -CGAL/Vector_3.h -CGAL/Voronoi_diagram_2.h -CGAL/Voronoi_intersection_2_traits_3.h -CGAL/Weighted_alpha_shape_euclidean_traits_2.h -CGAL/Weighted_Minkowski_distance.h -CGAL/Weighted_point.h -CGAL/Width_3.h -CGAL/Width_default_traits_3.h -CGAL/wlop_simplify_and_regularize_point_set.h -]=]) -separate_arguments(list_of_documented_headers UNIX_COMMAND ${list_of_documented_headers_txt}) diff --git a/Installation/cmake/modules/list_of_whitelisted_headers.cmake b/Installation/cmake/modules/list_of_whitelisted_headers.cmake index b12e83415f3..c6bfe0e3adb 100644 --- a/Installation/cmake/modules/list_of_whitelisted_headers.cmake +++ b/Installation/cmake/modules/list_of_whitelisted_headers.cmake @@ -5,6 +5,24 @@ set(list_of_whitelisted_headers_txt [=[ CGAL/IO/write_las_points.h CGAL/IO/read_ply_points.h CGAL/IO/write_ply_points.h + CGAL/Surface_mesh_parameterization/internal/shortest_path.h + CGAL/Three/exceptions.h + CGAL/Three/Polyhedron_demo_plugin_interface.h + CGAL/Three/Scene_interface.h + CGAL/Three/Scene_item_with_properties.h + CGAL/Three/Scene_zoomable_item_interface.h + CGAL/Three/Viewer_interface.h + CGAL/Three/Polyhedron_demo_io_plugin_interface.h + CGAL/Three/Scene_draw_interface.h + CGAL/Three/Scene_item_config.h + CGAL/Three/Scene_print_item_interface.h + CGAL/Three/TextRenderer.h + CGAL/Three/Polyhedron_demo_plugin_helper.h + CGAL/Three/Scene_group_item.h + CGAL/Three/Scene_item.h + CGAL/Three/Scene_transparent_interface.h + CGAL/Three/Viewer_config.h + ]=]) separate_arguments(list_of_whitelisted_headers UNIX_COMMAND ${list_of_whitelisted_headers_txt}) diff --git a/Installation/cmake/modules/process_dependencies.cmake b/Installation/cmake/modules/process_dependencies.cmake index 25aff19b907..bbab0fcfed6 100644 --- a/Installation/cmake/modules/process_dependencies.cmake +++ b/Installation/cmake/modules/process_dependencies.cmake @@ -1,4 +1,4 @@ -foreach(n RANGE 5 ${CMAKE_ARGC}) +foreach(n RANGE 7 ${CMAKE_ARGC}) list(APPEND INPUT_FILES ${CMAKE_ARGV${n}}) endforeach() @@ -7,14 +7,15 @@ if(NOT CGAL_PACKAGES_PREFIX) "The variable `CGAL_PACKAGES_PREFIX` should be defined to the prefix of CGAL packages!") endif() -#message("regexp: \\. ${CGAL_PACKAGES_PREFIX}/[^/]*/include/CGAL/.*h") +get_filename_component(INSTALLATION "${CMAKE_BINARY_DIR}" DIRECTORY) +get_filename_component(BUILD_DIR "${INSTALLATION}" NAME) foreach(INPUT_FILE ${INPUT_FILES}) file(STRINGS ${INPUT_FILE} input) - #message("input is : ${input}") foreach(line ${input}) string(REGEX MATCHALL "^\\.* ${CGAL_PACKAGES_PREFIX}/[A-Za-z0-9_.-]*/include/CGAL/[A-Za-z0-9_/.-]*\\.h" header ${line}) string(REGEX REPLACE "\\.* ${CGAL_PACKAGES_PREFIX}/" "" header "${header}") string(REGEX REPLACE "/.*" "" pkg "${header}") + string(REPLACE "${BUILD_DIR}" " " pkg "${pkg}") if(header) list(APPEND headers ${header}) endif() @@ -39,7 +40,15 @@ if(OUTPUT_HEADERS_LIST) endif() if(OUTPUT_PACKAGES_LIST) file(WRITE ${OUTPUT_PACKAGES_LIST} "") + if (CGAL_COPY_DEPENDENCIES) + file(WRITE ${CGAL_COPY_PATH} "") + endif() foreach(pkg ${pkgs}) file(APPEND ${OUTPUT_PACKAGES_LIST} "${pkg}\n") + if (CGAL_COPY_DEPENDENCIES) + file(APPEND ${CGAL_COPY_PATH} "${pkg}\n") + endif() endforeach() endif() + + diff --git a/Installation/package_info/Installation/dependencies b/Installation/package_info/Installation/dependencies new file mode 100644 index 00000000000..aef3b5a3343 --- /dev/null +++ b/Installation/package_info/Installation/dependencies @@ -0,0 +1,3 @@ + +Installation +STL_Extension diff --git a/Interpolation/package_info/Interpolation/dependencies b/Interpolation/package_info/Interpolation/dependencies new file mode 100644 index 00000000000..a327018fba1 --- /dev/null +++ b/Interpolation/package_info/Interpolation/dependencies @@ -0,0 +1,17 @@ + +Algebraic_foundations +Circulator +Filtered_kernel +Hash_map +Installation +Interpolation +Kernel_23 +Number_types +Polygon +Profiling_tools +Property_map +STL_Extension +Spatial_sorting +Stream_support +TDS_2 +Triangulation_2 diff --git a/Intersections_2/package_info/Intersections_2/dependencies b/Intersections_2/package_info/Intersections_2/dependencies new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Intersections_3/include/CGAL/internal/Intersections_3/Triangle_3_Segment_3_intersection.h b/Intersections_3/include/CGAL/internal/Intersections_3/Triangle_3_Segment_3_intersection.h index e26e108a5de..320919e4593 100644 --- a/Intersections_3/include/CGAL/internal/Intersections_3/Triangle_3_Segment_3_intersection.h +++ b/Intersections_3/include/CGAL/internal/Intersections_3/Triangle_3_Segment_3_intersection.h @@ -257,13 +257,12 @@ intersection_coplanar(const typename K::Triangle_3 &t, case NEGATIVE: // c is isolated on the negative side return t3s3_intersection_coplanar_aux(a,b,c,p,q,true,k); - case COLLINEAR: + default: if ( collinear_ordered(p,c,q) ) // c is inside [p,q] return intersection_return(c); else return intersection_return(); } - case NEGATIVE: if ( POSITIVE == pqc ) // b is isolated on the negative side @@ -271,7 +270,6 @@ intersection_coplanar(const typename K::Triangle_3 &t, else // a is isolated on the positive side return t3s3_intersection_coplanar_aux(b,c,a,q,p,false,k); - case COLLINEAR: switch ( pqc ) { case POSITIVE: @@ -282,11 +280,10 @@ intersection_coplanar(const typename K::Triangle_3 &t, case NEGATIVE: // a is isolated on the positive side return t3s3_intersection_coplanar_aux(b,c,a,q,p,false,k); - case COLLINEAR: + default: // COLLINEAR // b,c,p,q are aligned, [p,q]&[b,c] have the same direction return t3s3_intersection_collinear_aux(b,c,p,q,k); } - default: // should not happen. CGAL_error(); return intersection_return(); @@ -314,7 +311,7 @@ intersection_coplanar(const typename K::Triangle_3 &t, // the triangle lies in the negative halfspace // defined by the segment's supporting line. return intersection_return(); - case COLLINEAR: + default: // COLLINEAR if ( collinear_ordered(p,c,q) ) // c is inside [p,q] return intersection_return(c); else @@ -331,7 +328,7 @@ intersection_coplanar(const typename K::Triangle_3 &t, return intersection_return(b); else return intersection_return(); - case COLLINEAR: + default: // COLLINEAR // b,c,p,q are aligned, [p,q]&[c,b] have the same direction return t3s3_intersection_collinear_aux(c,b,p,q,k); } @@ -356,7 +353,7 @@ intersection_coplanar(const typename K::Triangle_3 &t, case NEGATIVE: // b is isolated on the positive side return t3s3_intersection_coplanar_aux(c,a,b,q,p,false,k); - case COLLINEAR: + default: // COLLINEAR // a,c,p,q are aligned, [p,q]&[c,a] have the same direction return t3s3_intersection_collinear_aux(c,a,p,q,k); } @@ -371,7 +368,7 @@ intersection_coplanar(const typename K::Triangle_3 &t, return intersection_return(a); else return intersection_return(); - case COLLINEAR: + default: // COLLINEAR // a,c,p,q are aligned, [p,q]&[a,c] have the same direction return t3s3_intersection_collinear_aux(a,c,p,q,k); } @@ -384,7 +381,7 @@ intersection_coplanar(const typename K::Triangle_3 &t, case NEGATIVE: // a,b,p,q are aligned, [p,q]&[b,a] have the same direction return t3s3_intersection_collinear_aux(b,a,p,q,k); - case COLLINEAR: + default: // COLLINEAR // case pqc == COLLINEAR is impossible since the triangle is // assumed to be non flat CGAL_error(); diff --git a/Intersections_3/package_info/Intersections_3/dependencies b/Intersections_3/package_info/Intersections_3/dependencies new file mode 100644 index 00000000000..5244bfc01ca --- /dev/null +++ b/Intersections_3/package_info/Intersections_3/dependencies @@ -0,0 +1,13 @@ + +Algebraic_foundations +Distance_2 +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +Profiling_tools +STL_Extension +Stream_support diff --git a/Interval_skip_list/package_info/Interval_skip_list/dependencies b/Interval_skip_list/package_info/Interval_skip_list/dependencies new file mode 100644 index 00000000000..e323621c3b0 --- /dev/null +++ b/Interval_skip_list/package_info/Interval_skip_list/dependencies @@ -0,0 +1,10 @@ + +Algebraic_foundations +Installation +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +Profiling_tools +STL_Extension +Stream_support diff --git a/Interval_support/package_info/Interval_support/dependencies b/Interval_support/package_info/Interval_support/dependencies new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Inventor/package_info/Inventor/dependencies b/Inventor/package_info/Inventor/dependencies new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Jet_fitting_3/package_info/Jet_fitting_3/dependencies b/Jet_fitting_3/package_info/Jet_fitting_3/dependencies new file mode 100644 index 00000000000..0c7760e3a26 --- /dev/null +++ b/Jet_fitting_3/package_info/Jet_fitting_3/dependencies @@ -0,0 +1,18 @@ + +Algebraic_foundations +Cartesian_kernel +Circulator +Distance_2 +Distance_3 +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Kernel_d +Modular_arithmetic +Number_types +Profiling_tools +STL_Extension +Solver_interface +Stream_support diff --git a/Kernel_23/include/CGAL/Weighted_point_2.h b/Kernel_23/include/CGAL/Weighted_point_2.h index 63f7fbe4107..751a2ed5cdf 100644 --- a/Kernel_23/include/CGAL/Weighted_point_2.h +++ b/Kernel_23/include/CGAL/Weighted_point_2.h @@ -33,6 +33,8 @@ #include #include #include +#include +#include namespace CGAL { diff --git a/Kernel_23/include/CGAL/Weighted_point_3.h b/Kernel_23/include/CGAL/Weighted_point_3.h index c953f53fb84..cb828b93a99 100644 --- a/Kernel_23/include/CGAL/Weighted_point_3.h +++ b/Kernel_23/include/CGAL/Weighted_point_3.h @@ -33,6 +33,7 @@ #include #include #include +#include namespace CGAL { diff --git a/Kernel_23/package_info/Kernel_23/dependencies b/Kernel_23/package_info/Kernel_23/dependencies new file mode 100644 index 00000000000..4ace6a4a787 --- /dev/null +++ b/Kernel_23/package_info/Kernel_23/dependencies @@ -0,0 +1,20 @@ + +Algebraic_foundations +Arithmetic_kernel +CGAL_Core +Cartesian_kernel +Distance_2 +Distance_3 +Filtered_kernel +Homogeneous_kernel +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Kernel_d +Modular_arithmetic +Number_types +Profiling_tools +STL_Extension +Stream_support diff --git a/Kernel_d/package_info/Kernel_d/dependencies b/Kernel_d/package_info/Kernel_d/dependencies new file mode 100644 index 00000000000..653f7b8189f --- /dev/null +++ b/Kernel_d/package_info/Kernel_d/dependencies @@ -0,0 +1,12 @@ + +Algebraic_foundations +Installation +Intersections_2 +Interval_support +Kernel_23 +Kernel_d +Modular_arithmetic +Number_types +Profiling_tools +STL_Extension +Stream_support diff --git a/Kinetic_data_structures/package_info/Kinetic_data_structures/dependencies b/Kinetic_data_structures/package_info/Kinetic_data_structures/dependencies new file mode 100644 index 00000000000..8b570c4e3df --- /dev/null +++ b/Kinetic_data_structures/package_info/Kinetic_data_structures/dependencies @@ -0,0 +1,30 @@ + +Algebraic_foundations +Arithmetic_kernel +CGAL_Core +Cartesian_kernel +Circulator +Distance_2 +Distance_3 +Filtered_kernel +Hash_map +Homogeneous_kernel +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Kernel_d +Kinetic_data_structures +Modular_arithmetic +Number_types +Polygon +Profiling_tools +Property_map +STL_Extension +Spatial_sorting +Stream_support +TDS_2 +TDS_3 +Triangulation_2 +Triangulation_3 diff --git a/LEDA/package_info/LEDA/dependencies b/LEDA/package_info/LEDA/dependencies new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Linear_cell_complex/include/CGAL/Linear_cell_complex_bgl_min_items.h b/Linear_cell_complex/include/CGAL/Linear_cell_complex_bgl_min_items.h index 024a9be7440..67f241b4ed5 100644 --- a/Linear_cell_complex/include/CGAL/Linear_cell_complex_bgl_min_items.h +++ b/Linear_cell_complex/include/CGAL/Linear_cell_complex_bgl_min_items.h @@ -23,6 +23,7 @@ #include #include +#include namespace CGAL { diff --git a/Linear_cell_complex/package_info/Linear_cell_complex/dependencies b/Linear_cell_complex/package_info/Linear_cell_complex/dependencies new file mode 100644 index 00000000000..113e6302e51 --- /dev/null +++ b/Linear_cell_complex/package_info/Linear_cell_complex/dependencies @@ -0,0 +1,24 @@ + +Algebraic_foundations +Arithmetic_kernel +Cartesian_kernel +Circulator +Combinatorial_map +Distance_2 +Distance_3 +Filtered_kernel +Generalized_map +Hash_map +Homogeneous_kernel +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Kernel_d +Linear_cell_complex +Modular_arithmetic +Number_types +Profiling_tools +STL_Extension +Stream_support diff --git a/Maintenance/infrastructure/gauguin.geometryfactory.com/reference_platforms/x64_Cygwin-Windows10_MSVC2013-Debug-64bits/CMakeCache.txt b/Maintenance/infrastructure/gauguin.geometryfactory.com/reference_platforms/x64_Cygwin-Windows10_MSVC2013-Debug-64bits/CMakeCache.txt index 15492457dd6..ddda8f68bb7 100644 --- a/Maintenance/infrastructure/gauguin.geometryfactory.com/reference_platforms/x64_Cygwin-Windows10_MSVC2013-Debug-64bits/CMakeCache.txt +++ b/Maintenance/infrastructure/gauguin.geometryfactory.com/reference_platforms/x64_Cygwin-Windows10_MSVC2013-Debug-64bits/CMakeCache.txt @@ -178,19 +178,19 @@ CMAKE_C_FLAGS_RELWITHDEBINFO:STRING=/MD /O2 /Ob1 /DNDEBUG CMAKE_C_STANDARD_LIBRARIES:STRING=kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib //Flags used by the linker. -CMAKE_EXE_LINKER_FLAGS:STRING=/machine:x64 +CMAKE_EXE_LINKER_FLAGS:STRING=/machine:x64 /INCREMENTAL:NO /DEBUG:NONE //Flags used by the linker during debug builds. -CMAKE_EXE_LINKER_FLAGS_DEBUG:STRING=/debug /INCREMENTAL +CMAKE_EXE_LINKER_FLAGS_DEBUG:STRING=/INCREMENTAL:NO /DEBUG:NONE //Flags used by the linker during release minsize builds. -CMAKE_EXE_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO +CMAKE_EXE_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO /DEBUG:NONE //Flags used by the linker during release builds. -CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO +CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO /DEBUG:NONE //Flags used by the linker during Release with Debug Info builds. -CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL +CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/INCREMENTAL:NO /DEBUG:NONE //user executables (bin) CMAKE_INSTALL_BINDIR:PATH=bin @@ -250,19 +250,19 @@ CMAKE_LINKER:FILEPATH=C:/Program Files (x86)/Microsoft Visual Studio 12.0/VC/bin CMAKE_MAKE_PROGRAM:FILEPATH=nmake //Flags used by the linker during the creation of modules. -CMAKE_MODULE_LINKER_FLAGS:STRING=/machine:x64 +CMAKE_MODULE_LINKER_FLAGS:STRING=/machine:x64 /DEBUG:NONE /INCREMENTAL:NO //Flags used by the linker during debug builds. -CMAKE_MODULE_LINKER_FLAGS_DEBUG:STRING=/debug /INCREMENTAL +CMAKE_MODULE_LINKER_FLAGS_DEBUG:STRING= //Flags used by the linker during release minsize builds. -CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO +CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL:STRING= //Flags used by the linker during release builds. -CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO +CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING= //Flags used by the linker during Release with Debug Info builds. -CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL +CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING= //Path to a program. CMAKE_NM:FILEPATH=CMAKE_NM-NOTFOUND @@ -297,19 +297,19 @@ CMAKE_RC_FLAGS_RELEASE:STRING= CMAKE_RC_FLAGS_RELWITHDEBINFO:STRING= //Flags used by the linker during the creation of dll's. -CMAKE_SHARED_LINKER_FLAGS:STRING=/machine:x64 +CMAKE_SHARED_LINKER_FLAGS:STRING=/machine:x64 /DEBUG:NONE /INCREMENTAL:NO //Flags used by the linker during debug builds. -CMAKE_SHARED_LINKER_FLAGS_DEBUG:STRING=/debug /INCREMENTAL +CMAKE_SHARED_LINKER_FLAGS_DEBUG:STRING= //Flags used by the linker during release minsize builds. -CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO +CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL:STRING= //Flags used by the linker during release builds. -CMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO +CMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING= //Flags used by the linker during Release with Debug Info builds. -CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL +CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING= //If set, runtime paths are not added when installing shared libraries, // but are added when building. @@ -319,7 +319,7 @@ CMAKE_SKIP_INSTALL_RPATH:BOOL=OFF CMAKE_SKIP_RPATH:BOOL=OFF //Flags used by the linker during the creation of static libraries. -CMAKE_STATIC_LINKER_FLAGS:STRING=/machine:x64 +CMAKE_STATIC_LINKER_FLAGS:STRING=/machine:x64 /DEBUG:NONE /INCREMENTAL:NO //Flags used by the linker during debug builds. CMAKE_STATIC_LINKER_FLAGS_DEBUG:STRING= diff --git a/Maintenance/infrastructure/gauguin.geometryfactory.com/reference_platforms/x64_Cygwin-Windows10_MSVC2013-Release-64bits/CMakeCache.txt b/Maintenance/infrastructure/gauguin.geometryfactory.com/reference_platforms/x64_Cygwin-Windows10_MSVC2013-Release-64bits/CMakeCache.txt index 6d77cdf78aa..1ca446325ae 100644 --- a/Maintenance/infrastructure/gauguin.geometryfactory.com/reference_platforms/x64_Cygwin-Windows10_MSVC2013-Release-64bits/CMakeCache.txt +++ b/Maintenance/infrastructure/gauguin.geometryfactory.com/reference_platforms/x64_Cygwin-Windows10_MSVC2013-Release-64bits/CMakeCache.txt @@ -169,19 +169,19 @@ CMAKE_C_FLAGS_RELWITHDEBINFO:STRING=/MD /O2 /Ob1 /DCGAL_NDEBUG CMAKE_C_STANDARD_LIBRARIES:STRING=kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib //Flags used by the linker. -CMAKE_EXE_LINKER_FLAGS:STRING=/machine:x64 +CMAKE_EXE_LINKER_FLAGS:STRING=/machine:x64 /INCREMENTAL:NO /DEBUG:NONE //Flags used by the linker during debug builds. -CMAKE_EXE_LINKER_FLAGS_DEBUG:STRING=/debug /INCREMENTAL +CMAKE_EXE_LINKER_FLAGS_DEBUG:STRING=/INCREMENTAL:NO /DEBUG:NONE //Flags used by the linker during release minsize builds. -CMAKE_EXE_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO +CMAKE_EXE_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO /DEBUG:NONE //Flags used by the linker during release builds. -CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO +CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO /DEBUG:NONE //Flags used by the linker during Release with Debug Info builds. -CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL +CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/INCREMENTAL:NO /DEBUG:NONE //user executables (bin) CMAKE_INSTALL_BINDIR:PATH=bin @@ -238,19 +238,19 @@ CMAKE_LINKER:FILEPATH=C:/Program Files (x86)/Microsoft Visual Studio 12.0/VC/bin CMAKE_MAKE_PROGRAM:STRING=nmake //Flags used by the linker during the creation of modules. -CMAKE_MODULE_LINKER_FLAGS:STRING=/machine:x64 +CMAKE_MODULE_LINKER_FLAGS:STRING=/machine:x64 /DEBUG:NONE /INCREMENTAL:NO //Flags used by the linker during debug builds. -CMAKE_MODULE_LINKER_FLAGS_DEBUG:STRING=/debug /INCREMENTAL +CMAKE_MODULE_LINKER_FLAGS_DEBUG:STRING= //Flags used by the linker during release minsize builds. -CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO +CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL:STRING= //Flags used by the linker during release builds. -CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO +CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING= //Flags used by the linker during Release with Debug Info builds. -CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL +CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING= //Value Computed by CMake CMAKE_PROJECT_NAME:STATIC=CGAL @@ -262,19 +262,19 @@ CMAKE_RC_COMPILER:FILEPATH=C:/Program Files (x86)/Windows Kits/8.1/bin/x64/rc.ex CMAKE_RC_FLAGS:STRING=/DWIN32 //Flags used by the linker during the creation of dll's. -CMAKE_SHARED_LINKER_FLAGS:STRING=/machine:x64 +CMAKE_SHARED_LINKER_FLAGS:STRING=/machine:x64 /DEBUG:NONE /INCREMENTAL:NO //Flags used by the linker during debug builds. -CMAKE_SHARED_LINKER_FLAGS_DEBUG:STRING=/debug /INCREMENTAL +CMAKE_SHARED_LINKER_FLAGS_DEBUG:STRING= //Flags used by the linker during release minsize builds. -CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO +CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL:STRING= //Flags used by the linker during release builds. -CMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO +CMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING= //Flags used by the linker during Release with Debug Info builds. -CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL +CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING= //If set, runtime paths are not added when installing shared libraries, // but are added when building. @@ -284,7 +284,7 @@ CMAKE_SKIP_INSTALL_RPATH:BOOL=OFF CMAKE_SKIP_RPATH:BOOL=OFF //Flags used by the linker during the creation of static libraries. -CMAKE_STATIC_LINKER_FLAGS:STRING=/machine:x64 +CMAKE_STATIC_LINKER_FLAGS:STRING=/machine:x64 /DEBUG:NONE /INCREMENTAL:NO //Flags used by the linker during debug builds. CMAKE_STATIC_LINKER_FLAGS_DEBUG:STRING= diff --git a/Maintenance/infrastructure/gauguin.geometryfactory.com/reference_platforms/x64_Cygwin-Windows10_MSVC2015-Debug-64bits/CMakeCache.txt b/Maintenance/infrastructure/gauguin.geometryfactory.com/reference_platforms/x64_Cygwin-Windows10_MSVC2015-Debug-64bits/CMakeCache.txt index 80ad31aa9e2..a708392d550 100644 --- a/Maintenance/infrastructure/gauguin.geometryfactory.com/reference_platforms/x64_Cygwin-Windows10_MSVC2015-Debug-64bits/CMakeCache.txt +++ b/Maintenance/infrastructure/gauguin.geometryfactory.com/reference_platforms/x64_Cygwin-Windows10_MSVC2015-Debug-64bits/CMakeCache.txt @@ -134,19 +134,19 @@ CMAKE_C_FLAGS_RELWITHDEBINFO:STRING=/MD /O2 /Ob1 /DNDEBUG CMAKE_C_STANDARD_LIBRARIES:STRING=kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib //Flags used by the linker. -CMAKE_EXE_LINKER_FLAGS:STRING=/machine:x64 +CMAKE_EXE_LINKER_FLAGS:STRING=/machine:x64 /INCREMENTAL:NO /DEBUG:NONE //Flags used by the linker during debug builds. -CMAKE_EXE_LINKER_FLAGS_DEBUG:STRING=/debug /INCREMENTAL +CMAKE_EXE_LINKER_FLAGS_DEBUG:STRING=/INCREMENTAL:NO /DEBUG:NONE //Flags used by the linker during release minsize builds. -CMAKE_EXE_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO +CMAKE_EXE_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO /DEBUG:NONE //Flags used by the linker during release builds. -CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO +CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO /DEBUG:NONE //Flags used by the linker during Release with Debug Info builds. -CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL +CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/INCREMENTAL:NO /DEBUG:NONE //User executables (bin) CMAKE_INSTALL_BINDIR:PATH=bin @@ -203,19 +203,19 @@ CMAKE_INSTALL_SYSCONFDIR:PATH=etc CMAKE_LINKER:FILEPATH=C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/bin/x86_amd64/link.exe //Flags used by the linker during the creation of modules. -CMAKE_MODULE_LINKER_FLAGS:STRING=/machine:x64 +CMAKE_MODULE_LINKER_FLAGS:STRING=/machine:x64 /DEBUG:NONE /INCREMENTAL:NO //Flags used by the linker during debug builds. -CMAKE_MODULE_LINKER_FLAGS_DEBUG:STRING=/debug /INCREMENTAL +CMAKE_MODULE_LINKER_FLAGS_DEBUG:STRING= //Flags used by the linker during release minsize builds. -CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO +CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL:STRING= //Flags used by the linker during release builds. -CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO +CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING= //Flags used by the linker during Release with Debug Info builds. -CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL +CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING= //Value Computed by CMake CMAKE_PROJECT_NAME:STATIC=CGAL @@ -241,19 +241,19 @@ CMAKE_RC_FLAGS_RELEASE:STRING= CMAKE_RC_FLAGS_RELWITHDEBINFO:STRING= //Flags used by the linker during the creation of dll's. -CMAKE_SHARED_LINKER_FLAGS:STRING=/machine:x64 +CMAKE_SHARED_LINKER_FLAGS:STRING=/machine:x64 /DEBUG:NONE /INCREMENTAL:NO //Flags used by the linker during debug builds. -CMAKE_SHARED_LINKER_FLAGS_DEBUG:STRING=/debug /INCREMENTAL +CMAKE_SHARED_LINKER_FLAGS_DEBUG:STRING= //Flags used by the linker during release minsize builds. -CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO +CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL:STRING= //Flags used by the linker during release builds. -CMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO +CMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING= //Flags used by the linker during Release with Debug Info builds. -CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL +CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING= //If set, runtime paths are not added when installing shared libraries, // but are added when building. @@ -263,7 +263,7 @@ CMAKE_SKIP_INSTALL_RPATH:BOOL=OFF CMAKE_SKIP_RPATH:BOOL=OFF //Flags used by the linker during the creation of static libraries. -CMAKE_STATIC_LINKER_FLAGS:STRING=/machine:x64 +CMAKE_STATIC_LINKER_FLAGS:STRING=/machine:x64 /DEBUG:NONE /INCREMENTAL:NO //Flags used by the linker during debug builds. CMAKE_STATIC_LINKER_FLAGS_DEBUG:STRING= diff --git a/Maintenance/infrastructure/gauguin.geometryfactory.com/reference_platforms/x64_Cygwin-Windows10_MSVC2015-Release-64bits/CMakeCache.txt b/Maintenance/infrastructure/gauguin.geometryfactory.com/reference_platforms/x64_Cygwin-Windows10_MSVC2015-Release-64bits/CMakeCache.txt index 0b908674f32..6e34ebfc1bf 100644 --- a/Maintenance/infrastructure/gauguin.geometryfactory.com/reference_platforms/x64_Cygwin-Windows10_MSVC2015-Release-64bits/CMakeCache.txt +++ b/Maintenance/infrastructure/gauguin.geometryfactory.com/reference_platforms/x64_Cygwin-Windows10_MSVC2015-Release-64bits/CMakeCache.txt @@ -134,19 +134,19 @@ CMAKE_C_FLAGS_RELWITHDEBINFO:STRING=/MD /Zi /O2 /Ob1 /DCGAL_NDEBUG CMAKE_C_STANDARD_LIBRARIES:STRING=kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib //Flags used by the linker. -CMAKE_EXE_LINKER_FLAGS:STRING=/machine:x64 +CMAKE_EXE_LINKER_FLAGS:STRING=/machine:x64 /INCREMENTAL:NO /DEBUG:NONE //Flags used by the linker during debug builds. -CMAKE_EXE_LINKER_FLAGS_DEBUG:STRING=/debug /INCREMENTAL +CMAKE_EXE_LINKER_FLAGS_DEBUG:STRING=/INCREMENTAL:NO /DEBUG:NONE //Flags used by the linker during release minsize builds. -CMAKE_EXE_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO +CMAKE_EXE_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO /DEBUG:NONE //Flags used by the linker during release builds. -CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO +CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO /DEBUG:NONE //Flags used by the linker during Release with Debug Info builds. -CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL +CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/INCREMENTAL:NO /DEBUG:NONE //User executables (bin) CMAKE_INSTALL_BINDIR:PATH=bin @@ -203,19 +203,19 @@ CMAKE_INSTALL_SYSCONFDIR:PATH=etc CMAKE_LINKER:FILEPATH=C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/bin/x86_amd64/link.exe //Flags used by the linker during the creation of modules. -CMAKE_MODULE_LINKER_FLAGS:STRING=/machine:x64 +CMAKE_MODULE_LINKER_FLAGS:STRING=/machine:x64 /DEBUG:NONE /INCREMENTAL:NO //Flags used by the linker during debug builds. -CMAKE_MODULE_LINKER_FLAGS_DEBUG:STRING=/debug /INCREMENTAL +CMAKE_MODULE_LINKER_FLAGS_DEBUG:STRING= //Flags used by the linker during release minsize builds. -CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO +CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL:STRING= //Flags used by the linker during release builds. -CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO +CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING= //Flags used by the linker during Release with Debug Info builds. -CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL +CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING= //Value Computed by CMake CMAKE_PROJECT_NAME:STATIC=CGAL @@ -241,19 +241,19 @@ CMAKE_RC_FLAGS_RELEASE:STRING= CMAKE_RC_FLAGS_RELWITHDEBINFO:STRING= //Flags used by the linker during the creation of dll's. -CMAKE_SHARED_LINKER_FLAGS:STRING=/machine:x64 +CMAKE_SHARED_LINKER_FLAGS:STRING=/machine:x64 /DEBUG:NONE /INCREMENTAL:NO //Flags used by the linker during debug builds. -CMAKE_SHARED_LINKER_FLAGS_DEBUG:STRING=/debug /INCREMENTAL +CMAKE_SHARED_LINKER_FLAGS_DEBUG:STRING= //Flags used by the linker during release minsize builds. -CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO +CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL:STRING= //Flags used by the linker during release builds. -CMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO +CMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING= //Flags used by the linker during Release with Debug Info builds. -CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL +CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING= //If set, runtime paths are not added when installing shared libraries, // but are added when building. @@ -263,7 +263,7 @@ CMAKE_SKIP_INSTALL_RPATH:BOOL=OFF CMAKE_SKIP_RPATH:BOOL=OFF //Flags used by the linker during the creation of static libraries. -CMAKE_STATIC_LINKER_FLAGS:STRING=/machine:x64 +CMAKE_STATIC_LINKER_FLAGS:STRING=/machine:x64 /DEBUG:NONE /INCREMENTAL:NO //Flags used by the linker during debug builds. CMAKE_STATIC_LINKER_FLAGS_DEBUG:STRING= diff --git a/Maintenance/infrastructure/gauguin.geometryfactory.com/reference_platforms/x64_Cygwin-Windows10_MSVC2017-Debug-64bits/CMakeCache.txt b/Maintenance/infrastructure/gauguin.geometryfactory.com/reference_platforms/x64_Cygwin-Windows10_MSVC2017-Debug-64bits/CMakeCache.txt index ec393a475e5..30a2aa5caa2 100644 --- a/Maintenance/infrastructure/gauguin.geometryfactory.com/reference_platforms/x64_Cygwin-Windows10_MSVC2017-Debug-64bits/CMakeCache.txt +++ b/Maintenance/infrastructure/gauguin.geometryfactory.com/reference_platforms/x64_Cygwin-Windows10_MSVC2017-Debug-64bits/CMakeCache.txt @@ -140,19 +140,19 @@ CMAKE_C_FLAGS_RELWITHDEBINFO:STRING=/MD /O2 /Ob1 /DNDEBUG CMAKE_C_STANDARD_LIBRARIES:STRING=kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib //Flags used by the linker. -CMAKE_EXE_LINKER_FLAGS:STRING=/machine:x64 +CMAKE_EXE_LINKER_FLAGS:STRING=/machine:x64 /INCREMENTAL:NO /DEBUG:NONE //Flags used by the linker during debug builds. -CMAKE_EXE_LINKER_FLAGS_DEBUG:STRING=/debug /INCREMENTAL +CMAKE_EXE_LINKER_FLAGS_DEBUG:STRING=/INCREMENTAL:NO /DEBUG:NONE //Flags used by the linker during release minsize builds. -CMAKE_EXE_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO +CMAKE_EXE_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO /DEBUG:NONE //Flags used by the linker during release builds. -CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO +CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO /DEBUG:NONE //Flags used by the linker during Release with Debug Info builds. -CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL +CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/INCREMENTAL:NO /DEBUG:NONE //user executables (bin) CMAKE_INSTALL_BINDIR:PATH=bin @@ -209,19 +209,19 @@ CMAKE_INSTALL_SYSCONFDIR:PATH=etc CMAKE_LINKER:FILEPATH=C:/Program Files (x86)/Microsoft Visual Studio/2017/Professional/VC/Tools/MSVC/14.11.25503/bin/HostX86/x64/link.exe //Flags used by the linker during the creation of modules. -CMAKE_MODULE_LINKER_FLAGS:STRING=/machine:x64 +CMAKE_MODULE_LINKER_FLAGS:STRING=/machine:x64 /DEBUG:NONE /INCREMENTAL:NO //Flags used by the linker during debug builds. -CMAKE_MODULE_LINKER_FLAGS_DEBUG:STRING=/debug /INCREMENTAL +CMAKE_MODULE_LINKER_FLAGS_DEBUG:STRING= //Flags used by the linker during release minsize builds. -CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO +CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL:STRING= //Flags used by the linker during release builds. -CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO +CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING= //Flags used by the linker during Release with Debug Info builds. -CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL +CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING= //Value Computed by CMake CMAKE_PROJECT_NAME:STATIC=CGAL @@ -247,19 +247,19 @@ CMAKE_RC_FLAGS_RELEASE:STRING= CMAKE_RC_FLAGS_RELWITHDEBINFO:STRING= //Flags used by the linker during the creation of dll's. -CMAKE_SHARED_LINKER_FLAGS:STRING=/machine:x64 +CMAKE_SHARED_LINKER_FLAGS:STRING=/machine:x64 /debug:NONE /INCREMENTAL:NO //Flags used by the linker during debug builds. -CMAKE_SHARED_LINKER_FLAGS_DEBUG:STRING=/debug /INCREMENTAL +CMAKE_SHARED_LINKER_FLAGS_DEBUG:STRING= //Flags used by the linker during release minsize builds. -CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO +CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL:STRING= //Flags used by the linker during release builds. -CMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO +CMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING= //Flags used by the linker during Release with Debug Info builds. -CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL +CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING= //If set, runtime paths are not added when installing shared libraries, // but are added when building. @@ -269,7 +269,7 @@ CMAKE_SKIP_INSTALL_RPATH:BOOL=OFF CMAKE_SKIP_RPATH:BOOL=OFF //Flags used by the linker during the creation of static libraries. -CMAKE_STATIC_LINKER_FLAGS:STRING=/machine:x64 +CMAKE_STATIC_LINKER_FLAGS:STRING=/machine:x64 /debug:NONE /INCREMENTAL:NO //Flags used by the linker during debug builds. CMAKE_STATIC_LINKER_FLAGS_DEBUG:STRING= diff --git a/Maintenance/infrastructure/gauguin.geometryfactory.com/reference_platforms/x64_Cygwin-Windows10_MSVC2017-Release-64bits-extra_flags/CMakeCache.txt b/Maintenance/infrastructure/gauguin.geometryfactory.com/reference_platforms/x64_Cygwin-Windows10_MSVC2017-Release-64bits-extra_flags/CMakeCache.txt index d59a45d2a4f..cfc4542821f 100644 --- a/Maintenance/infrastructure/gauguin.geometryfactory.com/reference_platforms/x64_Cygwin-Windows10_MSVC2017-Release-64bits-extra_flags/CMakeCache.txt +++ b/Maintenance/infrastructure/gauguin.geometryfactory.com/reference_platforms/x64_Cygwin-Windows10_MSVC2017-Release-64bits-extra_flags/CMakeCache.txt @@ -140,19 +140,19 @@ CMAKE_C_FLAGS_RELWITHDEBINFO:STRING=/MD /O2 /Ob1 /DCGAL_NDEBUG CMAKE_C_STANDARD_LIBRARIES:STRING=kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib //Flags used by the linker. -CMAKE_EXE_LINKER_FLAGS:STRING=/machine:x64 +CMAKE_EXE_LINKER_FLAGS:STRING=/machine:x64 /INCREMENTAL:NO /DEBUG:NONE //Flags used by the linker during debug builds. -CMAKE_EXE_LINKER_FLAGS_DEBUG:STRING=/debug /INCREMENTAL +CMAKE_EXE_LINKER_FLAGS_DEBUG:STRING=/INCREMENTAL:NO /DEBUG:NONE //Flags used by the linker during release minsize builds. -CMAKE_EXE_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO +CMAKE_EXE_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO /DEBUG:NONE //Flags used by the linker during release builds. -CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO +CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO /DEBUG:NONE //Flags used by the linker during Release with Debug Info builds. -CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL +CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/INCREMENTAL:NO /DEBUG:NONE //user executables (bin) CMAKE_INSTALL_BINDIR:PATH=bin @@ -209,19 +209,19 @@ CMAKE_INSTALL_SYSCONFDIR:PATH=etc CMAKE_LINKER:FILEPATH=C:/Program Files (x86)/Microsoft Visual Studio/2017/Professional/VC/Tools/MSVC/14.11.25503/bin/HostX86/x64/link.exe //Flags used by the linker during the creation of modules. -CMAKE_MODULE_LINKER_FLAGS:STRING=/machine:x64 +CMAKE_MODULE_LINKER_FLAGS:STRING=/machine:x64 /debug:NONE /INCREMENTAL:NO //Flags used by the linker during debug builds. -CMAKE_MODULE_LINKER_FLAGS_DEBUG:STRING=/debug /INCREMENTAL +CMAKE_MODULE_LINKER_FLAGS_DEBUG:STRING=/debug:NONE /INCREMENTAL:NO //Flags used by the linker during release minsize builds. -CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO +CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL:STRING=/debug:NONE /INCREMENTAL:NO //Flags used by the linker during release builds. -CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO +CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING=/debug:NONE /INCREMENTAL:NO //Flags used by the linker during Release with Debug Info builds. -CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL +CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug:NONE /INCREMENTAL:NO //Value Computed by CMake CMAKE_PROJECT_NAME:STATIC=CGAL @@ -247,19 +247,19 @@ CMAKE_RC_FLAGS_RELEASE:STRING= CMAKE_RC_FLAGS_RELWITHDEBINFO:STRING= //Flags used by the linker during the creation of dll's. -CMAKE_SHARED_LINKER_FLAGS:STRING=/machine:x64 +CMAKE_SHARED_LINKER_FLAGS:STRING=/machine:x64 /debug:NONE /INCREMENTAL:NO //Flags used by the linker during debug builds. -CMAKE_SHARED_LINKER_FLAGS_DEBUG:STRING=/debug /INCREMENTAL +CMAKE_SHARED_LINKER_FLAGS_DEBUG:STRING= //Flags used by the linker during release minsize builds. -CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO +CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL:STRING= //Flags used by the linker during release builds. -CMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO +CMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING= //Flags used by the linker during Release with Debug Info builds. -CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL +CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING= //If set, runtime paths are not added when installing shared libraries, // but are added when building. @@ -269,7 +269,7 @@ CMAKE_SKIP_INSTALL_RPATH:BOOL=OFF CMAKE_SKIP_RPATH:BOOL=OFF //Flags used by the linker during the creation of static libraries. -CMAKE_STATIC_LINKER_FLAGS:STRING=/machine:x64 +CMAKE_STATIC_LINKER_FLAGS:STRING=/machine:x64 /debug:NONE /INCREMENTAL:NO //Flags used by the linker during debug builds. CMAKE_STATIC_LINKER_FLAGS_DEBUG:STRING= diff --git a/Maintenance/infrastructure/gauguin.geometryfactory.com/reference_platforms/x64_Cygwin-Windows10_MSVC2017-Release-64bits/CMakeCache.txt b/Maintenance/infrastructure/gauguin.geometryfactory.com/reference_platforms/x64_Cygwin-Windows10_MSVC2017-Release-64bits/CMakeCache.txt index cd4d6c2decf..adc0a30a496 100644 --- a/Maintenance/infrastructure/gauguin.geometryfactory.com/reference_platforms/x64_Cygwin-Windows10_MSVC2017-Release-64bits/CMakeCache.txt +++ b/Maintenance/infrastructure/gauguin.geometryfactory.com/reference_platforms/x64_Cygwin-Windows10_MSVC2017-Release-64bits/CMakeCache.txt @@ -128,19 +128,19 @@ CMAKE_C_FLAGS_RELWITHDEBINFO:STRING=/MD /O2 /Ob1 /DCGAL_NDEBUG CMAKE_C_STANDARD_LIBRARIES:STRING=kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib //Flags used by the linker. -CMAKE_EXE_LINKER_FLAGS:STRING=/machine:x64 +CMAKE_EXE_LINKER_FLAGS:STRING=/machine:x64 /INCREMENTAL:NO /DEBUG:NONE //Flags used by the linker during debug builds. -CMAKE_EXE_LINKER_FLAGS_DEBUG:STRING=/debug /INCREMENTAL +CMAKE_EXE_LINKER_FLAGS_DEBUG:STRING=/INCREMENTAL:NO /DEBUG:NONE //Flags used by the linker during release minsize builds. -CMAKE_EXE_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO +CMAKE_EXE_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO /DEBUG:NONE //Flags used by the linker during release builds. -CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO +CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO /DEBUG:NONE //Flags used by the linker during Release with Debug Info builds. -CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL +CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/INCREMENTAL:NO /DEBUG:NONE //user executables (bin) CMAKE_INSTALL_BINDIR:PATH=bin @@ -197,19 +197,19 @@ CMAKE_INSTALL_SYSCONFDIR:PATH=etc CMAKE_LINKER:FILEPATH=C:/Program Files (x86)/Microsoft Visual Studio/2017/Professional/VC/Tools/MSVC/14.11.25503/bin/HostX86/x64/link.exe //Flags used by the linker during the creation of modules. -CMAKE_MODULE_LINKER_FLAGS:STRING=/machine:x64 +CMAKE_MODULE_LINKER_FLAGS:STRING=/machine:x64 /debug:NONE /INCREMENTAL:NO //Flags used by the linker during debug builds. -CMAKE_MODULE_LINKER_FLAGS_DEBUG:STRING=/debug /INCREMENTAL +CMAKE_MODULE_LINKER_FLAGS_DEBUG:STRING= //Flags used by the linker during release minsize builds. -CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO +CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL:STRING= //Flags used by the linker during release builds. -CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO +CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING= //Flags used by the linker during Release with Debug Info builds. -CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL +CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING= //Value Computed by CMake CMAKE_PROJECT_NAME:STATIC=CGAL @@ -235,19 +235,19 @@ CMAKE_RC_FLAGS_RELEASE:STRING= CMAKE_RC_FLAGS_RELWITHDEBINFO:STRING= //Flags used by the linker during the creation of dll's. -CMAKE_SHARED_LINKER_FLAGS:STRING=/machine:x64 +CMAKE_SHARED_LINKER_FLAGS:STRING=/machine:x64 /debug:NONE /INCREMENTAL:NO //Flags used by the linker during debug builds. -CMAKE_SHARED_LINKER_FLAGS_DEBUG:STRING=/debug /INCREMENTAL +CMAKE_SHARED_LINKER_FLAGS_DEBUG:STRING= //Flags used by the linker during release minsize builds. -CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO +CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL:STRING= //Flags used by the linker during release builds. -CMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO +CMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING= //Flags used by the linker during Release with Debug Info builds. -CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL +CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING= //If set, runtime paths are not added when installing shared libraries, // but are added when building. @@ -257,7 +257,7 @@ CMAKE_SKIP_INSTALL_RPATH:BOOL=OFF CMAKE_SKIP_RPATH:BOOL=OFF //Flags used by the linker during the creation of static libraries. -CMAKE_STATIC_LINKER_FLAGS:STRING=/machine:x64 +CMAKE_STATIC_LINKER_FLAGS:STRING=/machine:x64 /debug:NONE /INCREMENTAL:NO //Flags used by the linker during debug builds. CMAKE_STATIC_LINKER_FLAGS_DEBUG:STRING= diff --git a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/setup_VC12-32 b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/setup_VC12-32 index ed79af86ce5..9f0d6f31672 100644 --- a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/setup_VC12-32 +++ b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/setup_VC12-32 @@ -16,3 +16,4 @@ declare -x VisualStudioVersion="12.0" declare -x WindowsSDK_ExecutablePath_x64="C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v8.1A\\bin\\NETFX 4.5.1 Tools\\x64" declare -x WindowsSDK_ExecutablePath_x86="C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v8.1A\\bin\\NETFX 4.5.1 Tools\\" declare -x WindowsSdkDir="C:\\Program Files (x86)\\Windows Kits\\8.1\\" + diff --git a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/setup_common b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/setup_common index 7a4dd7e12f9..3e47f75a77b 100644 --- a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/setup_common +++ b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/setup_common @@ -54,3 +54,4 @@ if [ -n "${TBB_ARCH}" ]; then export PATH=$PATH:"${TBBROOT}\bin\\${TBB_ARCH}\vc${VC_VERSION}" fi + diff --git a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2012-Debug-32bits/CMakeCache.txt b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2012-Debug-32bits/CMakeCache.txt index 8a4ec86ff76..303d99357bb 100644 --- a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2012-Debug-32bits/CMakeCache.txt +++ b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2012-Debug-32bits/CMakeCache.txt @@ -171,19 +171,19 @@ CMAKE_C_FLAGS_RELWITHDEBINFO:STRING=/MD /O2 /Ob1 /D CGAL_NDEBUG CMAKE_C_STANDARD_LIBRARIES:STRING=kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib //Flags used by the linker. -CMAKE_EXE_LINKER_FLAGS:STRING=' /STACK:10000000 /machine:X86 ' +CMAKE_EXE_LINKER_FLAGS:STRING=' /STACK:10000000 /machine:X86 /INCREMENTAL:NO /DEBUG:NONE' //Flags used by the linker during debug builds. -CMAKE_EXE_LINKER_FLAGS_DEBUG:STRING=/debug /INCREMENTAL +CMAKE_EXE_LINKER_FLAGS_DEBUG:STRING= //Flags used by the linker during release minsize builds. -CMAKE_EXE_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO +CMAKE_EXE_LINKER_FLAGS_MINSIZEREL:STRING= //Flags used by the linker during release builds. -CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO +CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING= //Flags used by the linker during Release with Debug Info builds. -CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL +CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING= //Install path prefix, prepended onto install directories. CMAKE_INSTALL_PREFIX:PATH=C:/Program Files (x86)/CGAL @@ -195,19 +195,19 @@ CMAKE_LINKER:FILEPATH=C:/Program Files (x86)/Microsoft Visual Studio 11.0/VC/bin CMAKE_MAKE_PROGRAM:STRING=nmake //Flags used by the linker during the creation of modules. -CMAKE_MODULE_LINKER_FLAGS:STRING=' /STACK:10000000 /machine:X86 ' +CMAKE_MODULE_LINKER_FLAGS:STRING=' /STACK:10000000 /machine:X86 /DEBUG:NONE /INCREMENTAL:NO' //Flags used by the linker during debug builds. -CMAKE_MODULE_LINKER_FLAGS_DEBUG:STRING=/debug /INCREMENTAL +CMAKE_MODULE_LINKER_FLAGS_DEBUG:STRING= //Flags used by the linker during release minsize builds. -CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO +CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL:STRING= //Flags used by the linker during release builds. -CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO +CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING= //Flags used by the linker during Release with Debug Info builds. -CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL +CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING= //Value Computed by CMake CMAKE_PROJECT_NAME:STATIC=CGAL @@ -219,19 +219,22 @@ CMAKE_RC_COMPILER:FILEPATH=C:/Program Files (x86)/Windows Kits/8.0/bin/x86/rc.ex CMAKE_RC_FLAGS:STRING=' ' //Flags used by the linker during the creation of dll's. -CMAKE_SHARED_LINKER_FLAGS:STRING=' /STACK:10000000 /machine:X86 ' +CMAKE_SHARED_LINKER_FLAGS:STRING=' /STACK:10000000 /machine:X86 /DEBUG:NONE /INCREMENTAL:NO' + +//Flags used by the linker during the creation of static libs. +CMAKE_STATIC_LINKER_FLAGS:STRING=' /STACK:10000000 /machine:X86 /DEBUG:NONE /INCREMENTAL:NO' //Flags used by the linker during debug builds. -CMAKE_SHARED_LINKER_FLAGS_DEBUG:STRING=/debug /INCREMENTAL +CMAKE_SHARED_LINKER_FLAGS_DEBUG:STRING= //Flags used by the linker during release minsize builds. -CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO +CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL:STRING= //Flags used by the linker during release builds. -CMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO +CMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING= //Flags used by the linker during Release with Debug Info builds. -CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL +CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING= //If set, runtime paths are not added when installing shared libraries, // but are added when building. @@ -1755,3 +1758,4 @@ ZLIB_LIBRARY-ADVANCED:INTERNAL=1 //Result of TRY_RUN ZLIB_RUN_RES:INTERNAL=0 + diff --git a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2012-Debug-32bits/setup b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2012-Debug-32bits/setup index 0dcd774075f..10261f19b4a 100644 --- a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2012-Debug-32bits/setup +++ b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2012-Debug-32bits/setup @@ -3,3 +3,4 @@ export VC_VERSION="11" export ARCH="32" export PLATFORM_REFERENCE="/cygdrive/c/CGAL/reference_platforms" source "${PLATFORM_REFERENCE}/setup_common" + diff --git a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2012-Debug-64bits/CMakeCache.txt b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2012-Debug-64bits/CMakeCache.txt index 8ed5c72415c..e4b9f6ea484 100644 --- a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2012-Debug-64bits/CMakeCache.txt +++ b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2012-Debug-64bits/CMakeCache.txt @@ -171,19 +171,19 @@ CMAKE_C_FLAGS_RELWITHDEBINFO:STRING=/MD /O2 /Ob1 /D CGAL_NDEBUG CMAKE_C_STANDARD_LIBRARIES:STRING=kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib //Flags used by the linker. -CMAKE_EXE_LINKER_FLAGS:STRING=' /STACK:10000000 /machine:x64 ' +CMAKE_EXE_LINKER_FLAGS:STRING=' /STACK:10000000 /machine:x64 /INCREMENTAL:NO /DEBUG:NONE ' //Flags used by the linker during debug builds. -CMAKE_EXE_LINKER_FLAGS_DEBUG:STRING=/debug /INCREMENTAL +CMAKE_EXE_LINKER_FLAGS_DEBUG:STRING= //Flags used by the linker during release minsize builds. -CMAKE_EXE_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO +CMAKE_EXE_LINKER_FLAGS_MINSIZEREL:STRING= //Flags used by the linker during release builds. -CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO +CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO /DEBUG:NONE //Flags used by the linker during Release with Debug Info builds. -CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL +CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING= //Install path prefix, prepended onto install directories. CMAKE_INSTALL_PREFIX:PATH=C:/Program Files/CGAL @@ -195,10 +195,10 @@ CMAKE_LINKER:FILEPATH=C:/Program Files (x86)/Microsoft Visual Studio 11.0/VC/bin CMAKE_MAKE_PROGRAM:STRING=nmake //Flags used by the linker during the creation of modules. -CMAKE_MODULE_LINKER_FLAGS:STRING=' /STACK:10000000 /machine:x64 ' +CMAKE_MODULE_LINKER_FLAGS:STRING=' /STACK:10000000 /machine:x64 /DEBUG:NONE /INCREMENTAL:NO' //Flags used by the linker during debug builds. -CMAKE_MODULE_LINKER_FLAGS_DEBUG:STRING=/debug /INCREMENTAL +CMAKE_MODULE_LINKER_FLAGS_DEBUG:STRING= //Flags used by the linker during release minsize builds. CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO @@ -207,7 +207,7 @@ CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO //Flags used by the linker during Release with Debug Info builds. -CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL +CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/DEBUG:NONE /INCREMENTAL:NO //Value Computed by CMake CMAKE_PROJECT_NAME:STATIC=CGAL @@ -219,19 +219,19 @@ CMAKE_RC_COMPILER:FILEPATH=C:/Program Files (x86)/Windows Kits/8.0/bin/x64/rc.ex CMAKE_RC_FLAGS:STRING=' ' //Flags used by the linker during the creation of dll's. -CMAKE_SHARED_LINKER_FLAGS:STRING=' /STACK:10000000 /machine:x64 ' +CMAKE_SHARED_LINKER_FLAGS:STRING=' /STACK:10000000 /machine:x64 /DEBUG:NONE /INCREMENTAL:NO' //Flags used by the linker during debug builds. -CMAKE_SHARED_LINKER_FLAGS_DEBUG:STRING=/debug /INCREMENTAL +CMAKE_SHARED_LINKER_FLAGS_DEBUG:STRING=/DEBUG:NONE /INCREMENTAL:NO //Flags used by the linker during release minsize builds. -CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO +CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL:STRING= //Flags used by the linker during release builds. -CMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO +CMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING= //Flags used by the linker during Release with Debug Info builds. -CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL +CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING=/DEBUG:NONE /INCREMENTAL:NO //If set, runtime paths are not added when installing shared libraries, // but are added when building. @@ -1755,3 +1755,4 @@ ZLIB_LIBRARY-ADVANCED:INTERNAL=1 //Result of TRY_RUN ZLIB_RUN_RES:INTERNAL=0 + diff --git a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2012-Debug-64bits/setup b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2012-Debug-64bits/setup index d90f758c657..abb7435d938 100644 --- a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2012-Debug-64bits/setup +++ b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2012-Debug-64bits/setup @@ -10,3 +10,4 @@ source "${PLATFORM_REFERENCE}/setup_common" #export CGAL_ENABLE_VLD VLD_LIBRARY_DIR VLD_INCLUDE_DIR #PATH="$VLD_LIBRARY_DIR:$PATH" export PATH + diff --git a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2012-Release-32bits/CMakeCache.txt b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2012-Release-32bits/CMakeCache.txt index 240655e70b7..147e7fda12a 100644 --- a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2012-Release-32bits/CMakeCache.txt +++ b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2012-Release-32bits/CMakeCache.txt @@ -171,19 +171,19 @@ CMAKE_C_FLAGS_RELWITHDEBINFO:STRING=/MD /O2 /Ob1 /D CGAL_NDEBUG CMAKE_C_STANDARD_LIBRARIES:STRING=kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib //Flags used by the linker. -CMAKE_EXE_LINKER_FLAGS:STRING=' /STACK:10000000 /machine:X86 ' +CMAKE_EXE_LINKER_FLAGS:STRING=' /STACK:10000000 /machine:X86 /INCREMENTAL:NO /DEBUG:NONE' //Flags used by the linker during debug builds. -CMAKE_EXE_LINKER_FLAGS_DEBUG:STRING=/debug /INCREMENTAL +CMAKE_EXE_LINKER_FLAGS_DEBUG:STRING= //Flags used by the linker during release minsize builds. -CMAKE_EXE_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO +CMAKE_EXE_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO /DEBUG:NONE //Flags used by the linker during release builds. -CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO +CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO /DEBUG:NONE //Flags used by the linker during Release with Debug Info builds. -CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL +CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/DEBUG:NONE /INCREMENTAL:NO //Install path prefix, prepended onto install directories. CMAKE_INSTALL_PREFIX:PATH=C:/Program Files (x86)/CGAL @@ -195,10 +195,10 @@ CMAKE_LINKER:FILEPATH=C:/Program Files (x86)/Microsoft Visual Studio 11.0/VC/bin CMAKE_MAKE_PROGRAM:STRING=nmake //Flags used by the linker during the creation of modules. -CMAKE_MODULE_LINKER_FLAGS:STRING=' /STACK:10000000 /machine:X86 ' +CMAKE_MODULE_LINKER_FLAGS:STRING=' /STACK:10000000 /machine:X86 /DEBUG:NONE /INCREMENTAL:NO' //Flags used by the linker during debug builds. -CMAKE_MODULE_LINKER_FLAGS_DEBUG:STRING=/debug /INCREMENTAL +CMAKE_MODULE_LINKER_FLAGS_DEBUG:STRING=/DEBUG:NONE /INCREMENTAL:NO //Flags used by the linker during release minsize builds. CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO @@ -207,7 +207,7 @@ CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO //Flags used by the linker during Release with Debug Info builds. -CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL +CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/DEBUG:NONE /INCREMENTAL:NO //Value Computed by CMake CMAKE_PROJECT_NAME:STATIC=CGAL @@ -219,10 +219,10 @@ CMAKE_RC_COMPILER:FILEPATH=C:/Program Files (x86)/Windows Kits/8.0/bin/x86/rc.ex CMAKE_RC_FLAGS:STRING=' ' //Flags used by the linker during the creation of dll's. -CMAKE_SHARED_LINKER_FLAGS:STRING=' /STACK:10000000 /machine:X86 ' +CMAKE_SHARED_LINKER_FLAGS:STRING=' /STACK:10000000 /machine:X86 /DEBUG:NONE /INCREMENTAL:NO' //Flags used by the linker during debug builds. -CMAKE_SHARED_LINKER_FLAGS_DEBUG:STRING=/debug /INCREMENTAL +CMAKE_SHARED_LINKER_FLAGS_DEBUG:STRING=/DEBUG:NONE /INCREMENTAL:NO //Flags used by the linker during release minsize builds. CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO @@ -231,7 +231,7 @@ CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO CMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO //Flags used by the linker during Release with Debug Info builds. -CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL +CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING=/DEBUG:NONE /INCREMENTAL:NO //If set, runtime paths are not added when installing shared libraries, // but are added when building. @@ -1755,3 +1755,4 @@ ZLIB_LIBRARY-ADVANCED:INTERNAL=1 //Result of TRY_RUN ZLIB_RUN_RES:INTERNAL=0 + diff --git a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2012-Release-32bits/setup b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2012-Release-32bits/setup index 276d8ae2cda..173e6fa109c 100644 --- a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2012-Release-32bits/setup +++ b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2012-Release-32bits/setup @@ -4,5 +4,3 @@ export ARCH="32" export PLATFORM_REFERENCE="/cygdrive/c/CGAL/reference_platforms" source "${PLATFORM_REFERENCE}/setup_common" -COLLECT_DEMOS_BINARIES=y -export COLLECT_DEMOS_BINARIES diff --git a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2012-Release-64bits/CMakeCache.txt b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2012-Release-64bits/CMakeCache.txt index ae75ef90791..619476eae0d 100644 --- a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2012-Release-64bits/CMakeCache.txt +++ b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2012-Release-64bits/CMakeCache.txt @@ -171,19 +171,19 @@ CMAKE_C_FLAGS_RELWITHDEBINFO:STRING=/MD /O2 /Ob1 /D CGAL_NDEBUG CMAKE_C_STANDARD_LIBRARIES:STRING=kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib //Flags used by the linker. -CMAKE_EXE_LINKER_FLAGS:STRING=' /STACK:10000000 /machine:x64 ' +CMAKE_EXE_LINKER_FLAGS:STRING=' /STACK:10000000 /machine:x64 /INCREMENTAL:NO /DEBUG:NONE' //Flags used by the linker during debug builds. -CMAKE_EXE_LINKER_FLAGS_DEBUG:STRING=/debug /INCREMENTAL +CMAKE_EXE_LINKER_FLAGS_DEBUG:STRING=/DEBUG:NONE /INCREMENTAL:NO //Flags used by the linker during release minsize builds. -CMAKE_EXE_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO +CMAKE_EXE_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO /DEBUG:NONE //Flags used by the linker during release builds. -CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO +CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO /DEBUG:NONE //Flags used by the linker during Release with Debug Info builds. -CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL +CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/DEBUG:NONE /INCREMENTAL:NO //Install path prefix, prepended onto install directories. CMAKE_INSTALL_PREFIX:PATH=C:/Program Files/CGAL @@ -195,19 +195,19 @@ CMAKE_LINKER:FILEPATH=C:/Program Files (x86)/Microsoft Visual Studio 11.0/VC/bin CMAKE_MAKE_PROGRAM:STRING=nmake //Flags used by the linker during the creation of modules. -CMAKE_MODULE_LINKER_FLAGS:STRING=' /STACK:10000000 /machine:x64 ' +CMAKE_MODULE_LINKER_FLAGS:STRING=' /STACK:10000000 /machine:x64 /DEBUG:NONE /INCREMENTAL:NO' //Flags used by the linker during debug builds. -CMAKE_MODULE_LINKER_FLAGS_DEBUG:STRING=/debug /INCREMENTAL +CMAKE_MODULE_LINKER_FLAGS_DEBUG:STRING=/DEBUG:NONE /INCREMENTAL:NO //Flags used by the linker during release minsize builds. -CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO +CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL:STRING= //Flags used by the linker during release builds. -CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO +CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING= //Flags used by the linker during Release with Debug Info builds. -CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL +CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/DEBUG:NONE /INCREMENTAL:NO //Value Computed by CMake CMAKE_PROJECT_NAME:STATIC=CGAL @@ -219,19 +219,19 @@ CMAKE_RC_COMPILER:FILEPATH=C:/Program Files (x86)/Windows Kits/8.0/bin/x64/rc.ex CMAKE_RC_FLAGS:STRING=' ' //Flags used by the linker during the creation of dll's. -CMAKE_SHARED_LINKER_FLAGS:STRING=' /STACK:10000000 /machine:x64 ' +CMAKE_SHARED_LINKER_FLAGS:STRING=' /STACK:10000000 /machine:x64 /DEBUG:NONE /INCREMENTAL:NO' //Flags used by the linker during debug builds. -CMAKE_SHARED_LINKER_FLAGS_DEBUG:STRING=/debug /INCREMENTAL +CMAKE_SHARED_LINKER_FLAGS_DEBUG:STRING=/DEBUG:NONE /INCREMENTAL:NO //Flags used by the linker during release minsize builds. -CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO +CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL:STRING= //Flags used by the linker during release builds. -CMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO +CMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING= //Flags used by the linker during Release with Debug Info builds. -CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL +CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING=/DEBUG:NONE /INCREMENTAL:NO //If set, runtime paths are not added when installing shared libraries, // but are added when building. @@ -1755,3 +1755,4 @@ ZLIB_LIBRARY-ADVANCED:INTERNAL=1 //Result of TRY_RUN ZLIB_RUN_RES:INTERNAL=0 + diff --git a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2012-Release-64bits/setup b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2012-Release-64bits/setup index 8b44a7595b7..dad13d0de73 100644 --- a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2012-Release-64bits/setup +++ b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2012-Release-64bits/setup @@ -3,3 +3,4 @@ export VC_VERSION="11" export ARCH="64" export PLATFORM_REFERENCE="/cygdrive/c/CGAL/reference_platforms" source "${PLATFORM_REFERENCE}/setup_common" + diff --git a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Debug-32bits/CMakeCache.txt b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Debug-32bits/CMakeCache.txt index 589ee2ee66a..a6c09e4e0e0 100644 --- a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Debug-32bits/CMakeCache.txt +++ b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Debug-32bits/CMakeCache.txt @@ -21,22 +21,25 @@ BUILD_SHARED_LIBS:BOOL=ON Boost_DIR:PATH=Boost_DIR-NOTFOUND //Path to a file. -Boost_INCLUDE_DIR:PATH=C:/3rdPartyLibs/boost_1_55_0 +Boost_INCLUDE_DIR:PATH=C:/3rdPartyLibs/boost_1_57_0 //Boost library directory -Boost_LIBRARY_DIR:PATH=C:/3rdPartyLibs/boost_1_55_0/lib32 +Boost_LIBRARY_DIR:PATH=C:/3rdPartyLibs/boost_1_57_0/lib32 //Boost system library (debug) -Boost_SYSTEM_LIBRARY_DEBUG:FILEPATH=C:/3rdPartyLibs/boost_1_55_0/lib32/boost_system-vc120-mt-gd-1_55.lib +Boost_SYSTEM_LIBRARY_DEBUG:FILEPATH=C:/3rdPartyLibs/boost_1_57_0/lib32/boost_system-vc120-mt-gd-1_57.lib //Boost system library (release) -Boost_SYSTEM_LIBRARY_RELEASE:FILEPATH=C:/3rdPartyLibs/boost_1_55_0/lib32/boost_system-vc120-mt-1_55.lib +Boost_SYSTEM_LIBRARY_RELEASE:FILEPATH=C:/3rdPartyLibs/boost_1_57_0/lib32/boost_system-vc120-mt-1_57.lib //Boost thread library (debug) -Boost_THREAD_LIBRARY_DEBUG:FILEPATH=C:/3rdPartyLibs/boost_1_55_0/lib32/boost_thread-vc120-mt-gd-1_55.lib +Boost_THREAD_LIBRARY_DEBUG:FILEPATH=C:/3rdPartyLibs/boost_1_57_0/lib32/boost_thread-vc120-mt-gd-1_57.lib //Boost thread library (release) -Boost_THREAD_LIBRARY_RELEASE:FILEPATH=C:/3rdPartyLibs/boost_1_55_0/lib32/boost_thread-vc120-mt-1_55.lib +Boost_THREAD_LIBRARY_RELEASE:FILEPATH=C:/3rdPartyLibs/1_57_0/lib32/boost_thread-vc120-mt-1_57.lib + +//Boost atomic library (debug) +Boost_ATOMIC_LIBRARY_DEBUG:FILEPATH=C:/3rdPartyLibs/boost_1_57_0/lib32/boost_atomic-vc120-mt-gd-1_57.lib //Select to allow to use all preconfigured external libraries CGAL_ALLOW_ALL_PRECONFIGURED_LIBS_COMPONENT:BOOL=OFF @@ -102,8 +105,7 @@ CGAL_LIB_DEPENDS:STATIC=general;C:/3rdPartyLibs/VC-32/gmp-5.0.1_and_mpfr-3.0.0/l //Directory containing the Maintenance package CGAL_MAINTENANCE_PACKAGE_DIR:PATH=C:/CGAL/CGAL-I-REF -//Dependencies for the target -CGAL_Qt4_LIB_DEPENDS:STATIC=general;C:/3rdPartyLibs/VC-32/gmp-5.0.1_and_mpfr-3.0.0/lib/libmpfr-4.lib;general;C:/3rdPartyLibs/VC-32/gmp-5.0.1_and_mpfr-3.0.0/lib/libgmp-10.lib;optimized;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/qtmain.lib;debug;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/qtmaind.lib;optimized;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtOpenGL4.lib;debug;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtOpenGLd4.lib;optimized;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtGui4.lib;debug;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtGuid4.lib;optimized;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtCore4.lib;debug;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtCored4.lib;general;glu32;general;opengl32; + //Value Computed by CMake CGAL_SOURCE_DIR:STATIC=C:/CGAL/CGAL-I-REF @@ -162,19 +164,19 @@ CMAKE_C_FLAGS_RELWITHDEBINFO:STRING=/MD /O2 /Ob1 CMAKE_C_STANDARD_LIBRARIES:STRING=kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib //Flags used by the linker. -CMAKE_EXE_LINKER_FLAGS:STRING=' /machine:X86 ' +CMAKE_EXE_LINKER_FLAGS:STRING=' /machine:X86 /INCREMENTAL:NO /DEBUG:NONE' //Flags used by the linker during debug builds. -CMAKE_EXE_LINKER_FLAGS_DEBUG:STRING=/debug /INCREMENTAL +CMAKE_EXE_LINKER_FLAGS_DEBUG:STRING=/DEBUG:NONE /INCREMENTAL:NO //Flags used by the linker during release minsize builds. -CMAKE_EXE_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO +CMAKE_EXE_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO /DEBUG:NONE //Flags used by the linker during release builds. -CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO +CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO /DEBUG:NONE //Flags used by the linker during Release with Debug Info builds. -CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL +CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/DEBUG:NONE /INCREMENTAL:NO //Install path prefix, prepended onto install directories. CMAKE_INSTALL_PREFIX:PATH=C:/Program Files (x86)/CGAL @@ -186,19 +188,19 @@ CMAKE_LINKER:FILEPATH=C:/Program Files (x86)/Microsoft Visual Studio 12.0/VC/bin CMAKE_MAKE_PROGRAM:STRING=nmake //Flags used by the linker during the creation of modules. -CMAKE_MODULE_LINKER_FLAGS:STRING=' /machine:X86 ' +CMAKE_MODULE_LINKER_FLAGS:STRING=' /machine:X86 /DEBUG:NONE /INCREMENTAL:NO' //Flags used by the linker during debug builds. -CMAKE_MODULE_LINKER_FLAGS_DEBUG:STRING=/debug /INCREMENTAL +CMAKE_MODULE_LINKER_FLAGS_DEBUG:STRING=/DEBUG:NONE /INCREMENTAL:NO //Flags used by the linker during release minsize builds. -CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO +CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL:STRING= //Flags used by the linker during release builds. -CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO +CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING= //Flags used by the linker during Release with Debug Info builds. -CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL +CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/DEBUG:NONE /INCREMENTAL:NO //Value Computed by CMake CMAKE_PROJECT_NAME:STATIC=CGAL @@ -210,10 +212,10 @@ CMAKE_RC_COMPILER:FILEPATH=C:/Program Files (x86)/Windows Kits/8.1/bin/x86/rc.ex CMAKE_RC_FLAGS:STRING=' ' //Flags used by the linker during the creation of dll's. -CMAKE_SHARED_LINKER_FLAGS:STRING=' /machine:X86 ' +CMAKE_SHARED_LINKER_FLAGS:STRING=' /machine:X86 /DEBUG:NONE /INCREMENTAL:NO' //Flags used by the linker during debug builds. -CMAKE_SHARED_LINKER_FLAGS_DEBUG:STRING=/debug /INCREMENTAL +CMAKE_SHARED_LINKER_FLAGS_DEBUG:STRING=/DEBUG:NONE /INCREMENTAL:NO //Flags used by the linker during release minsize builds. CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO @@ -222,7 +224,7 @@ CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO CMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO //Flags used by the linker during Release with Debug Info builds. -CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL +CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING=/DEBUG:NONE /INCREMENTAL:NO //If set, runtime paths are not added when installing shared libraries, // but are added when building. @@ -262,628 +264,6 @@ OPENGL_gl_LIBRARY:STRING=opengl32 //GLU library for win32 OPENGL_glu_LIBRARY:STRING=glu32 -//path to Qt3 include directory -QT3_INCLUDE_DIR:PATH=QT3_INCLUDE_DIR-NOTFOUND - -//Path to a program. -QT3_MOC_EXECUTABLE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/bin/moc.exe - -//Path to a library. -QT3_QASSISTANTCLIENT_LIBRARY:FILEPATH=QT3_QASSISTANTCLIENT_LIBRARY-NOTFOUND - -//This Library is only needed by and included with Qt3 on MSWindows. -// It should be NOTFOUND, undefined or IGNORE otherwise. -QT3_QTMAIN_LIBRARY:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/qtmain.lib - -//Path to a library. -QT3_QT_LIBRARY:FILEPATH=QT3_QT_LIBRARY-NOTFOUND - -//Path to a program. -QT3_UIC_EXECUTABLE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/bin/uic.exe - -//Path to a library. -QT_ARTHURPLUGIN_PLUGIN_DEBUG:FILEPATH=QT_ARTHURPLUGIN_PLUGIN_DEBUG-NOTFOUND - -//Path to a library. -QT_ARTHURPLUGIN_PLUGIN_RELEASE:FILEPATH=QT_ARTHURPLUGIN_PLUGIN_RELEASE-NOTFOUND - -//Path to a library. -QT_CONTAINEREXTENSION_PLUGIN_DEBUG:FILEPATH=QT_CONTAINEREXTENSION_PLUGIN_DEBUG-NOTFOUND - -//Path to a library. -QT_CONTAINEREXTENSION_PLUGIN_RELEASE:FILEPATH=QT_CONTAINEREXTENSION_PLUGIN_RELEASE-NOTFOUND - -//Path to a library. -QT_CUSTOMWIDGETPLUGIN_PLUGIN_DEBUG:FILEPATH=QT_CUSTOMWIDGETPLUGIN_PLUGIN_DEBUG-NOTFOUND - -//Path to a library. -QT_CUSTOMWIDGETPLUGIN_PLUGIN_RELEASE:FILEPATH=QT_CUSTOMWIDGETPLUGIN_PLUGIN_RELEASE-NOTFOUND - -//Path to a program. -QT_DBUSCPP2XML_EXECUTABLE:FILEPATH=QT_DBUSCPP2XML_EXECUTABLE-NOTFOUND - -//Path to a program. -QT_DBUSXML2CPP_EXECUTABLE:FILEPATH=QT_DBUSXML2CPP_EXECUTABLE-NOTFOUND - -//Path to a program. -QT_DESIGNER_EXECUTABLE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/bin/designer.exe - -//The location of the Qt docs -QT_DOC_DIR:PATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/doc - -//The location of the Qt imports -QT_IMPORTS_DIR:PATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/imports - -//Path to a program. -QT_LINGUIST_EXECUTABLE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/bin/linguist.exe - -//Path to a program. -QT_LRELEASE_EXECUTABLE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/bin/lrelease.exe - -//Path to a program. -QT_LUPDATE_EXECUTABLE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/bin/lupdate.exe - -//The location of the Qt mkspecs containing qconfig.pri -QT_MKSPECS_DIR:PATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/mkspecs - -//Path to a program. -QT_MOC_EXECUTABLE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/bin/moc.exe - -//Path to a library. -QT_PHONONWIDGETS_PLUGIN_DEBUG:FILEPATH=QT_PHONONWIDGETS_PLUGIN_DEBUG-NOTFOUND - -//Path to a library. -QT_PHONONWIDGETS_PLUGIN_RELEASE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/plugins/designer/phononwidgets.dll - -//Path to a library. -QT_PHONON_DS9_PLUGIN_DEBUG:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/plugins/phonon_backend/phonon_ds9d4.dll - -//Path to a library. -QT_PHONON_DS9_PLUGIN_RELEASE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/plugins/phonon_backend/phonon_ds94.dll - -//Path to a file. -QT_PHONON_INCLUDE_DIR:PATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/include/phonon - -//The Qt PHONON library -QT_PHONON_LIBRARY:STRING=optimized;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/phonon4.lib;debug;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/phonond4.lib - -//Path to a library. -QT_PHONON_LIBRARY_DEBUG:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/phonond4.lib - -//Path to a library. -QT_PHONON_LIBRARY_RELEASE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/phonon4.lib - -//The location of the Qt plugins -QT_PLUGINS_DIR:PATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/plugins - -//Path to a library. -QT_QCNCODECS_PLUGIN_DEBUG:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/plugins/codecs/qcncodecsd4.dll - -//Path to a library. -QT_QCNCODECS_PLUGIN_RELEASE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/plugins/codecs/qcncodecs4.dll - -//Path to a program. -QT_QCOLLECTIONGENERATOR_EXECUTABLE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/bin/qcollectiongenerator.exe - -//Path to a library. -QT_QCOREWLANBEARER_PLUGIN_DEBUG:FILEPATH=QT_QCOREWLANBEARER_PLUGIN_DEBUG-NOTFOUND - -//Path to a library. -QT_QCOREWLANBEARER_PLUGIN_RELEASE:FILEPATH=QT_QCOREWLANBEARER_PLUGIN_RELEASE-NOTFOUND - -//Path to a library. -QT_QDECLARATIVEVIEW_PLUGIN_DEBUG:FILEPATH=QT_QDECLARATIVEVIEW_PLUGIN_DEBUG-NOTFOUND - -//Path to a library. -QT_QDECLARATIVEVIEW_PLUGIN_RELEASE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/plugins/designer/qdeclarativeview.dll - -//Path to a library. -QT_QDECORATIONDEFAULT_PLUGIN_DEBUG:FILEPATH=QT_QDECORATIONDEFAULT_PLUGIN_DEBUG-NOTFOUND - -//Path to a library. -QT_QDECORATIONDEFAULT_PLUGIN_RELEASE:FILEPATH=QT_QDECORATIONDEFAULT_PLUGIN_RELEASE-NOTFOUND - -//Path to a library. -QT_QDECORATIONWINDOWS_PLUGIN_DEBUG:FILEPATH=QT_QDECORATIONWINDOWS_PLUGIN_DEBUG-NOTFOUND - -//Path to a library. -QT_QDECORATIONWINDOWS_PLUGIN_RELEASE:FILEPATH=QT_QDECORATIONWINDOWS_PLUGIN_RELEASE-NOTFOUND - -//Path to a library. -QT_QGENERICBEARER_PLUGIN_DEBUG:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/plugins/bearer/qgenericbearerd4.dll - -//Path to a library. -QT_QGENERICBEARER_PLUGIN_RELEASE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/plugins/bearer/qgenericbearer4.dll - -//Path to a library. -QT_QGIF_PLUGIN_DEBUG:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/plugins/imageformats/qgifd4.dll - -//Path to a library. -QT_QGIF_PLUGIN_RELEASE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/plugins/imageformats/qgif4.dll - -//Path to a library. -QT_QGLGRAPHICSSYSTEM_PLUGIN_DEBUG:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/plugins/graphicssystems/qglgraphicssystemd4.dll - -//Path to a library. -QT_QGLGRAPHICSSYSTEM_PLUGIN_RELEASE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/plugins/graphicssystems/qglgraphicssystem4.dll - -//Path to a library. -QT_QICO_PLUGIN_DEBUG:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/plugins/imageformats/qicod4.dll - -//Path to a library. -QT_QICO_PLUGIN_RELEASE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/plugins/imageformats/qico4.dll - -//Path to a library. -QT_QIMSW_MULTI_PLUGIN_DEBUG:FILEPATH=QT_QIMSW_MULTI_PLUGIN_DEBUG-NOTFOUND - -//Path to a library. -QT_QIMSW_MULTI_PLUGIN_RELEASE:FILEPATH=QT_QIMSW_MULTI_PLUGIN_RELEASE-NOTFOUND - -//Path to a library. -QT_QJPCODECS_PLUGIN_DEBUG:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/plugins/codecs/qjpcodecsd4.dll - -//Path to a library. -QT_QJPCODECS_PLUGIN_RELEASE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/plugins/codecs/qjpcodecs4.dll - -//Path to a library. -QT_QJPEG_PLUGIN_DEBUG:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/plugins/imageformats/qjpegd4.dll - -//Path to a library. -QT_QJPEG_PLUGIN_RELEASE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/plugins/imageformats/qjpeg4.dll - -//Path to a library. -QT_QKRCODECS_PLUGIN_DEBUG:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/plugins/codecs/qkrcodecsd4.dll - -//Path to a library. -QT_QKRCODECS_PLUGIN_RELEASE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/plugins/codecs/qkrcodecs4.dll - -//The qmake executable for the Qt installation to use -QT_QMAKE_EXECUTABLE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/bin/qmake.exe - -//Path to a library. -QT_QMNG_PLUGIN_DEBUG:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/plugins/imageformats/qmngd4.dll - -//Path to a library. -QT_QMNG_PLUGIN_RELEASE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/plugins/imageformats/qmng4.dll - -//Path to a library. -QT_QSQLDB2_PLUGIN_DEBUG:FILEPATH=QT_QSQLDB2_PLUGIN_DEBUG-NOTFOUND - -//Path to a library. -QT_QSQLDB2_PLUGIN_RELEASE:FILEPATH=QT_QSQLDB2_PLUGIN_RELEASE-NOTFOUND - -//Path to a library. -QT_QSQLIBASE_PLUGIN_DEBUG:FILEPATH=QT_QSQLIBASE_PLUGIN_DEBUG-NOTFOUND - -//Path to a library. -QT_QSQLIBASE_PLUGIN_RELEASE:FILEPATH=QT_QSQLIBASE_PLUGIN_RELEASE-NOTFOUND - -//Path to a library. -QT_QSQLITE2_PLUGIN_DEBUG:FILEPATH=QT_QSQLITE2_PLUGIN_DEBUG-NOTFOUND - -//Path to a library. -QT_QSQLITE2_PLUGIN_RELEASE:FILEPATH=QT_QSQLITE2_PLUGIN_RELEASE-NOTFOUND - -//Path to a library. -QT_QSQLITE_PLUGIN_DEBUG:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/plugins/sqldrivers/qsqlited4.dll - -//Path to a library. -QT_QSQLITE_PLUGIN_RELEASE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/plugins/sqldrivers/qsqlite4.dll - -//Path to a library. -QT_QSQLMYSQL_PLUGIN_DEBUG:FILEPATH=QT_QSQLMYSQL_PLUGIN_DEBUG-NOTFOUND - -//Path to a library. -QT_QSQLMYSQL_PLUGIN_RELEASE:FILEPATH=QT_QSQLMYSQL_PLUGIN_RELEASE-NOTFOUND - -//Path to a library. -QT_QSQLOCI_PLUGIN_DEBUG:FILEPATH=QT_QSQLOCI_PLUGIN_DEBUG-NOTFOUND - -//Path to a library. -QT_QSQLOCI_PLUGIN_RELEASE:FILEPATH=QT_QSQLOCI_PLUGIN_RELEASE-NOTFOUND - -//Path to a library. -QT_QSQLODBC_PLUGIN_DEBUG:FILEPATH=QT_QSQLODBC_PLUGIN_DEBUG-NOTFOUND - -//Path to a library. -QT_QSQLODBC_PLUGIN_RELEASE:FILEPATH=QT_QSQLODBC_PLUGIN_RELEASE-NOTFOUND - -//Path to a library. -QT_QSQLPSQL_PLUGIN_DEBUG:FILEPATH=QT_QSQLPSQL_PLUGIN_DEBUG-NOTFOUND - -//Path to a library. -QT_QSQLPSQL_PLUGIN_RELEASE:FILEPATH=QT_QSQLPSQL_PLUGIN_RELEASE-NOTFOUND - -//Path to a library. -QT_QSQLTDS_PLUGIN_DEBUG:FILEPATH=QT_QSQLTDS_PLUGIN_DEBUG-NOTFOUND - -//Path to a library. -QT_QSQLTDS_PLUGIN_RELEASE:FILEPATH=QT_QSQLTDS_PLUGIN_RELEASE-NOTFOUND - -//Path to a library. -QT_QSVGICON_PLUGIN_DEBUG:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/plugins/iconengines/qsvgicond4.dll - -//Path to a library. -QT_QSVGICON_PLUGIN_RELEASE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/plugins/iconengines/qsvgicon4.dll - -//Path to a library. -QT_QSVG_PLUGIN_DEBUG:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/plugins/imageformats/qsvgd4.dll - -//Path to a library. -QT_QSVG_PLUGIN_RELEASE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/plugins/imageformats/qsvg4.dll - -//Path to a library. -QT_QT3SUPPORTWIDGETS_PLUGIN_DEBUG:FILEPATH=QT_QT3SUPPORTWIDGETS_PLUGIN_DEBUG-NOTFOUND - -//Path to a library. -QT_QT3SUPPORTWIDGETS_PLUGIN_RELEASE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/plugins/designer/qt3supportwidgets.dll - -//Path to a file. -QT_QT3SUPPORT_INCLUDE_DIR:PATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/include/Qt3Support - -//The Qt QT3SUPPORT library -QT_QT3SUPPORT_LIBRARY:STRING=optimized;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/Qt3Support4.lib;debug;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/Qt3Supportd4.lib - -//Path to a library. -QT_QT3SUPPORT_LIBRARY_DEBUG:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/Qt3Supportd4.lib - -//Path to a library. -QT_QT3SUPPORT_LIBRARY_RELEASE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/Qt3Support4.lib - -//Path to a library. -QT_QTACCESSIBLECOMPATWIDGETS_PLUGIN_DEBUG:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/plugins/accessible/qtaccessiblecompatwidgetsd4.dll - -//Path to a library. -QT_QTACCESSIBLECOMPATWIDGETS_PLUGIN_RELEASE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/plugins/accessible/qtaccessiblecompatwidgets4.dll - -//Path to a library. -QT_QTACCESSIBLEWIDGETS_PLUGIN_DEBUG:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/plugins/accessible/qtaccessiblewidgetsd4.dll - -//Path to a library. -QT_QTACCESSIBLEWIDGETS_PLUGIN_RELEASE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/plugins/accessible/qtaccessiblewidgets4.dll - -//Path to a file. -QT_QTASSISTANTCLIENT_INCLUDE_DIR:PATH=QT_QTASSISTANTCLIENT_INCLUDE_DIR-NOTFOUND - -//The Qt QTASSISTANTCLIENT library -QT_QTASSISTANTCLIENT_LIBRARY:STRING= - -//Path to a library. -QT_QTASSISTANTCLIENT_LIBRARY_DEBUG:FILEPATH=QT_QTASSISTANTCLIENT_LIBRARY_DEBUG-NOTFOUND - -//Path to a library. -QT_QTASSISTANTCLIENT_LIBRARY_RELEASE:FILEPATH=QT_QTASSISTANTCLIENT_LIBRARY_RELEASE-NOTFOUND - -//Path to a file. -QT_QTASSISTANT_INCLUDE_DIR:PATH=QT_QTASSISTANT_INCLUDE_DIR-NOTFOUND - -//The Qt QTASSISTANT library -QT_QTASSISTANT_LIBRARY:STRING= - -//Path to a library. -QT_QTASSISTANT_LIBRARY_DEBUG:FILEPATH=QT_QTASSISTANT_LIBRARY_DEBUG-NOTFOUND - -//Path to a library. -QT_QTASSISTANT_LIBRARY_RELEASE:FILEPATH=QT_QTASSISTANT_LIBRARY_RELEASE-NOTFOUND - -//The Qt QTCLUCENE library -QT_QTCLUCENE_LIBRARY:STRING=optimized;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtCLucene4.lib;debug;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtCLucened4.lib - -//Path to a library. -QT_QTCLUCENE_LIBRARY_DEBUG:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtCLucened4.lib - -//Path to a library. -QT_QTCLUCENE_LIBRARY_RELEASE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtCLucene4.lib - -//Path to a file. -QT_QTCORE_INCLUDE_DIR:PATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/include/QtCore - -//The Qt QTCORE library -QT_QTCORE_LIBRARY:STRING=optimized;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtCore4.lib;debug;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtCored4.lib - -//Path to a library. -QT_QTCORE_LIBRARY_DEBUG:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtCored4.lib - -//Path to a library. -QT_QTCORE_LIBRARY_RELEASE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtCore4.lib - -//Path to a file. -QT_QTDBUS_INCLUDE_DIR:PATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/include/QtDBus - -//The Qt QTDBUS library -QT_QTDBUS_LIBRARY:STRING= - -//Path to a library. -QT_QTDBUS_LIBRARY_DEBUG:FILEPATH=QT_QTDBUS_LIBRARY_DEBUG-NOTFOUND - -//Path to a library. -QT_QTDBUS_LIBRARY_RELEASE:FILEPATH=QT_QTDBUS_LIBRARY_RELEASE-NOTFOUND - -//Path to a file. -QT_QTDECLARATIVE_INCLUDE_DIR:PATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/include/QtDeclarative - -//The Qt QTDECLARATIVE library -QT_QTDECLARATIVE_LIBRARY:STRING=optimized;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtDeclarative4.lib;debug;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtDeclaratived4.lib - -//Path to a library. -QT_QTDECLARATIVE_LIBRARY_DEBUG:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtDeclaratived4.lib - -//Path to a library. -QT_QTDECLARATIVE_LIBRARY_RELEASE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtDeclarative4.lib - -//Path to a file. -QT_QTDESIGNERCOMPONENTS_INCLUDE_DIR:PATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/include/QtDesigner - -//The Qt QTDESIGNERCOMPONENTS library -QT_QTDESIGNERCOMPONENTS_LIBRARY:STRING=optimized;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtDesignerComponents4.lib;debug;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtDesignerComponentsd4.lib - -//Path to a library. -QT_QTDESIGNERCOMPONENTS_LIBRARY_DEBUG:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtDesignerComponentsd4.lib - -//Path to a library. -QT_QTDESIGNERCOMPONENTS_LIBRARY_RELEASE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtDesignerComponents4.lib - -//Path to a file. -QT_QTDESIGNER_INCLUDE_DIR:PATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/include/QtDesigner - -//The Qt QTDESIGNER library -QT_QTDESIGNER_LIBRARY:STRING=optimized;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtDesigner4.lib;debug;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtDesignerd4.lib - -//Path to a library. -QT_QTDESIGNER_LIBRARY_DEBUG:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtDesignerd4.lib - -//Path to a library. -QT_QTDESIGNER_LIBRARY_RELEASE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtDesigner4.lib - -//Path to a file. -QT_QTGUI_INCLUDE_DIR:PATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/include/QtGui - -//The Qt QTGUI library -QT_QTGUI_LIBRARY:STRING=optimized;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtGui4.lib;debug;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtGuid4.lib - -//Path to a library. -QT_QTGUI_LIBRARY_DEBUG:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtGuid4.lib - -//Path to a library. -QT_QTGUI_LIBRARY_RELEASE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtGui4.lib - -//Path to a file. -QT_QTHELP_INCLUDE_DIR:PATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/include/QtHelp - -//The Qt QTHELP library -QT_QTHELP_LIBRARY:STRING=optimized;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtHelp4.lib;debug;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtHelpd4.lib - -//Path to a library. -QT_QTHELP_LIBRARY_DEBUG:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtHelpd4.lib - -//Path to a library. -QT_QTHELP_LIBRARY_RELEASE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtHelp4.lib - -//Path to a library. -QT_QTIFF_PLUGIN_DEBUG:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/plugins/imageformats/qtiffd4.dll - -//Path to a library. -QT_QTIFF_PLUGIN_RELEASE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/plugins/imageformats/qtiff4.dll - -//The Qt QTMAIN library -QT_QTMAIN_LIBRARY:STRING=optimized;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/qtmain.lib;debug;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/qtmaind.lib - -//Path to a library. -QT_QTMAIN_LIBRARY_DEBUG:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/qtmaind.lib - -//Path to a library. -QT_QTMAIN_LIBRARY_RELEASE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/qtmain.lib - -//Path to a file. -QT_QTMULTIMEDIA_INCLUDE_DIR:PATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/include/QtMultimedia - -//The Qt QTMULTIMEDIA library -QT_QTMULTIMEDIA_LIBRARY:STRING=optimized;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtMultimedia4.lib;debug;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtMultimediad4.lib - -//Path to a library. -QT_QTMULTIMEDIA_LIBRARY_DEBUG:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtMultimediad4.lib - -//Path to a library. -QT_QTMULTIMEDIA_LIBRARY_RELEASE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtMultimedia4.lib - -//Path to a file. -QT_QTNETWORK_INCLUDE_DIR:PATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/include/QtNetwork - -//The Qt QTNETWORK library -QT_QTNETWORK_LIBRARY:STRING=optimized;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtNetwork4.lib;debug;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtNetworkd4.lib - -//Path to a library. -QT_QTNETWORK_LIBRARY_DEBUG:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtNetworkd4.lib - -//Path to a library. -QT_QTNETWORK_LIBRARY_RELEASE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtNetwork4.lib - -//Path to a file. -QT_QTNSPLUGIN_INCLUDE_DIR:PATH=QT_QTNSPLUGIN_INCLUDE_DIR-NOTFOUND - -//The Qt QTNSPLUGIN library -QT_QTNSPLUGIN_LIBRARY:STRING= - -//Path to a library. -QT_QTNSPLUGIN_LIBRARY_DEBUG:FILEPATH=QT_QTNSPLUGIN_LIBRARY_DEBUG-NOTFOUND - -//Path to a library. -QT_QTNSPLUGIN_LIBRARY_RELEASE:FILEPATH=QT_QTNSPLUGIN_LIBRARY_RELEASE-NOTFOUND - -//Path to a file. -QT_QTOPENGL_INCLUDE_DIR:PATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/include/QtOpenGL - -//The Qt QTOPENGL library -QT_QTOPENGL_LIBRARY:STRING=optimized;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtOpenGL4.lib;debug;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtOpenGLd4.lib - -//Path to a library. -QT_QTOPENGL_LIBRARY_DEBUG:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtOpenGLd4.lib - -//Path to a library. -QT_QTOPENGL_LIBRARY_RELEASE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtOpenGL4.lib - -//Path to a library. -QT_QTRACEGRAPHICSSYSTEM_PLUGIN_DEBUG:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/plugins/graphicssystems/qtracegraphicssystemd4.dll - -//Path to a library. -QT_QTRACEGRAPHICSSYSTEM_PLUGIN_RELEASE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/plugins/graphicssystems/qtracegraphicssystem4.dll - -//Path to a library. -QT_QTSCRIPTDBUS_PLUGIN_DEBUG:FILEPATH=QT_QTSCRIPTDBUS_PLUGIN_DEBUG-NOTFOUND - -//Path to a library. -QT_QTSCRIPTDBUS_PLUGIN_RELEASE:FILEPATH=QT_QTSCRIPTDBUS_PLUGIN_RELEASE-NOTFOUND - -//Path to a file. -QT_QTSCRIPTTOOLS_INCLUDE_DIR:PATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/include/QtScriptTools - -//The Qt QTSCRIPTTOOLS library -QT_QTSCRIPTTOOLS_LIBRARY:STRING=optimized;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtScriptTools4.lib;debug;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtScriptToolsd4.lib - -//Path to a library. -QT_QTSCRIPTTOOLS_LIBRARY_DEBUG:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtScriptToolsd4.lib - -//Path to a library. -QT_QTSCRIPTTOOLS_LIBRARY_RELEASE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtScriptTools4.lib - -//Path to a file. -QT_QTSCRIPT_INCLUDE_DIR:PATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/include/QtScript - -//The Qt QTSCRIPT library -QT_QTSCRIPT_LIBRARY:STRING=optimized;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtScript4.lib;debug;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtScriptd4.lib - -//Path to a library. -QT_QTSCRIPT_LIBRARY_DEBUG:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtScriptd4.lib - -//Path to a library. -QT_QTSCRIPT_LIBRARY_RELEASE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtScript4.lib - -//Path to a file. -QT_QTSQL_INCLUDE_DIR:PATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/include/QtSql - -//The Qt QTSQL library -QT_QTSQL_LIBRARY:STRING=optimized;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtSql4.lib;debug;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtSqld4.lib - -//Path to a library. -QT_QTSQL_LIBRARY_DEBUG:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtSqld4.lib - -//Path to a library. -QT_QTSQL_LIBRARY_RELEASE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtSql4.lib - -//Path to a file. -QT_QTSVG_INCLUDE_DIR:PATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/include/QtSvg - -//The Qt QTSVG library -QT_QTSVG_LIBRARY:STRING=optimized;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtSvg4.lib;debug;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtSvgd4.lib - -//Path to a library. -QT_QTSVG_LIBRARY_DEBUG:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtSvgd4.lib - -//Path to a library. -QT_QTSVG_LIBRARY_RELEASE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtSvg4.lib - -//Path to a file. -QT_QTTEST_INCLUDE_DIR:PATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/include/QtTest - -//The Qt QTTEST library -QT_QTTEST_LIBRARY:STRING=optimized;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtTest4.lib;debug;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtTestd4.lib - -//Path to a library. -QT_QTTEST_LIBRARY_DEBUG:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtTestd4.lib - -//Path to a library. -QT_QTTEST_LIBRARY_RELEASE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtTest4.lib - -//Path to a file. -QT_QTUITOOLS_INCLUDE_DIR:PATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/include/QtUiTools - -//The Qt QTUITOOLS library -QT_QTUITOOLS_LIBRARY:STRING=optimized;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtUiTools.lib;debug;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtUiToolsd.lib - -//Path to a library. -QT_QTUITOOLS_LIBRARY_DEBUG:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtUiToolsd.lib - -//Path to a library. -QT_QTUITOOLS_LIBRARY_RELEASE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtUiTools.lib - -//Path to a library. -QT_QTWCODECS_PLUGIN_DEBUG:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/plugins/codecs/qtwcodecsd4.dll - -//Path to a library. -QT_QTWCODECS_PLUGIN_RELEASE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/plugins/codecs/qtwcodecs4.dll - -//Path to a file. -QT_QTWEBKIT_INCLUDE_DIR:PATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/include/QtWebKit - -//The Qt QTWEBKIT library -QT_QTWEBKIT_LIBRARY:STRING= - -//Path to a library. -QT_QTWEBKIT_LIBRARY_DEBUG:FILEPATH=QT_QTWEBKIT_LIBRARY_DEBUG-NOTFOUND - -//Path to a library. -QT_QTWEBKIT_LIBRARY_RELEASE:FILEPATH=QT_QTWEBKIT_LIBRARY_RELEASE-NOTFOUND - -//Path to a file. -QT_QTXMLPATTERNS_INCLUDE_DIR:PATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/include/QtXmlPatterns - -//The Qt QTXMLPATTERNS library -QT_QTXMLPATTERNS_LIBRARY:STRING=optimized;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtXmlPatterns4.lib;debug;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtXmlPatternsd4.lib - -//Path to a library. -QT_QTXMLPATTERNS_LIBRARY_DEBUG:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtXmlPatternsd4.lib - -//Path to a library. -QT_QTXMLPATTERNS_LIBRARY_RELEASE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtXmlPatterns4.lib - -//Path to a file. -QT_QTXML_INCLUDE_DIR:PATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/include/QtXml - -//The Qt QTXML library -QT_QTXML_LIBRARY:STRING=optimized;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtXml4.lib;debug;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtXmld4.lib - -//Path to a library. -QT_QTXML_LIBRARY_DEBUG:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtXmld4.lib - -//Path to a library. -QT_QTXML_LIBRARY_RELEASE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtXml4.lib - -//Path to a library. -QT_QWEBVIEW_PLUGIN_DEBUG:FILEPATH=QT_QWEBVIEW_PLUGIN_DEBUG-NOTFOUND - -//Path to a library. -QT_QWEBVIEW_PLUGIN_RELEASE:FILEPATH=QT_QWEBVIEW_PLUGIN_RELEASE-NOTFOUND - -//Path to a library. -QT_QWSTSLIBMOUSEHANDLER_PLUGIN_DEBUG:FILEPATH=QT_QWSTSLIBMOUSEHANDLER_PLUGIN_DEBUG-NOTFOUND - -//Path to a library. -QT_QWSTSLIBMOUSEHANDLER_PLUGIN_RELEASE:FILEPATH=QT_QWSTSLIBMOUSEHANDLER_PLUGIN_RELEASE-NOTFOUND - -//Path to a program. -QT_RCC_EXECUTABLE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/bin/rcc.exe - -//Path to a library. -QT_TASKMENUEXTENSION_PLUGIN_DEBUG:FILEPATH=QT_TASKMENUEXTENSION_PLUGIN_DEBUG-NOTFOUND - -//Path to a library. -QT_TASKMENUEXTENSION_PLUGIN_RELEASE:FILEPATH=QT_TASKMENUEXTENSION_PLUGIN_RELEASE-NOTFOUND - -//The location of the Qt translations -QT_TRANSLATIONS_DIR:PATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/translations - -//Path to a program. -QT_UIC3_EXECUTABLE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/bin/uic3.exe - -//Path to a program. -QT_UIC_EXECUTABLE:FILEPATH=C:/3rdPartyLibs/VC12-32/QT-4.8.4/bin/uic.exe - -//Path to a library. -QT_WORLDTIMECLOCKPLUGIN_PLUGIN_DEBUG:FILEPATH=QT_WORLDTIMECLOCKPLUGIN_PLUGIN_DEBUG-NOTFOUND - -//Path to a library. -QT_WORLDTIMECLOCKPLUGIN_PLUGIN_RELEASE:FILEPATH=QT_WORLDTIMECLOCKPLUGIN_PLUGIN_RELEASE-NOTFOUND - //Select external library BLAS WITH_BLAS:BOOL=OFF @@ -896,8 +276,8 @@ WITH_CGAL_ImageIO:BOOL=ON //Enable CGAL component CGAL_Qt3 WITH_CGAL_Qt3:BOOL=OFF -//Enable CGAL component CGAL_Qt4 -WITH_CGAL_Qt4:BOOL=ON +//Enable CGAL component CGAL_Qt5 +WITH_CGAL_Qt5:BOOL=OFF //Select external library Coin3D WITH_Coin3D:BOOL=OFF @@ -985,9 +365,9 @@ Boost_THREAD_LIBRARY_DEBUG-ADVANCED:INTERNAL=1 //ADVANCED property for variable: Boost_THREAD_LIBRARY_RELEASE Boost_THREAD_LIBRARY_RELEASE-ADVANCED:INTERNAL=1 CGAL_3RD_PARTY_DEFINITIONS:INTERNAL=-DBOOST_ALL_DYN_LINK -CGAL_3RD_PARTY_INCLUDE_DIRS:INTERNAL=C:/3rdPartyLibs/boost_1_55_0 +CGAL_3RD_PARTY_INCLUDE_DIRS:INTERNAL=C:/3rdPartyLibs/boost_1_57_0 CGAL_3RD_PARTY_LIBRARIES:INTERNAL= -CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=C:/3rdPartyLibs/boost_1_55_0/lib32 +CGAL_3RD_PARTY_LIBRARIES_DIRS:INTERNAL=C:/3rdPartyLibs/boost_1_57_0/lib32 CGAL_3RD_PARTY_PRECONFIGURED:INTERNAL= //ADVANCED property for variable: CGAL_Boost_USE_STATIC_LIBS CGAL_Boost_USE_STATIC_LIBS-ADVANCED:INTERNAL=1 @@ -1039,7 +419,7 @@ CGAL_CFG_TYPENAME_BEFORE_DEFAULT_ARGUMENT_BUG_COMPILED:INTERNAL=TRUE CGAL_CFG_USING_BASE_MEMBER_BUG_2:INTERNAL=0 //Result of TRY_COMPILE CGAL_CFG_USING_BASE_MEMBER_BUG_2_COMPILED:INTERNAL=TRUE -CGAL_CONFIGURED_LIBRARIES:INTERNAL=CGAL_Core;CGAL_ImageIO;CGAL_Qt3;CGAL_Qt4 +CGAL_CONFIGURED_LIBRARIES:INTERNAL=CGAL_Core;CGAL_ImageIO; CGAL_Core_3RD_PARTY_DEFINITIONS:INTERNAL= CGAL_Core_3RD_PARTY_INCLUDE_DIRS:INTERNAL= CGAL_Core_3RD_PARTY_LIBRARIES:INTERNAL= @@ -1103,13 +483,7 @@ CGAL_Qt3_3RD_PARTY_LIBRARIES_DIRS:INTERNAL= CGAL_Qt3_LIBRARY:INTERNAL= //Variable hidden from user CGAL_Qt3_LIBRARY_INSTALLED:INTERNAL= -CGAL_Qt4_3RD_PARTY_DEFINITIONS:INTERNAL=-DQT_DLL -CGAL_Qt4_3RD_PARTY_INCLUDE_DIRS:INTERNAL=C:/3rdPartyLibs/VC12-32/QT-4.8.4/include -CGAL_Qt4_3RD_PARTY_LIBRARIES:INTERNAL=optimized;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/qtmain.lib;debug;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/qtmaind.lib;optimized;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtOpenGL4.lib;debug;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtOpenGLd4.lib;optimized;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtGui4.lib;debug;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtGuid4.lib;optimized;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtCore4.lib;debug;C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib/QtCored4.lib;glu32;opengl32 -CGAL_Qt4_3RD_PARTY_LIBRARIES_DIRS:INTERNAL= -CGAL_Qt4_LIBRARY:INTERNAL= -//Variable hidden from user -CGAL_Qt4_LIBRARY_INSTALLED:INTERNAL= + //Variable hidden from user CGAL_SUPPORTING_3RD_PARTY_LIBRARIES:INTERNAL=GMP;MPFR;ZLIB;OpenGL;LEDA;MPFI;RS;RS3;OpenNL;TAUCS;Eigen3;BLAS;LAPACK;QGLViewer;ESBTL;Coin3D;NTL;IPE //This is the cygwin platform. @@ -1275,7 +649,6 @@ QT4_RUN_RES:INTERNAL=0 QT_ARTHURPLUGIN_PLUGIN_DEBUG-ADVANCED:INTERNAL=1 //ADVANCED property for variable: QT_ARTHURPLUGIN_PLUGIN_RELEASE QT_ARTHURPLUGIN_PLUGIN_RELEASE-ADVANCED:INTERNAL=1 -QT_BINARY_DIR:INTERNAL=C:/3rdPartyLibs/VC12-32/QT-4.8.4/bin //ADVANCED property for variable: QT_CONTAINEREXTENSION_PLUGIN_DEBUG QT_CONTAINEREXTENSION_PLUGIN_DEBUG-ADVANCED:INTERNAL=1 //ADVANCED property for variable: QT_CONTAINEREXTENSION_PLUGIN_RELEASE @@ -1292,13 +665,10 @@ QT_DBUSXML2CPP_EXECUTABLE-ADVANCED:INTERNAL=1 QT_DESIGNER_EXECUTABLE-ADVANCED:INTERNAL=1 //ADVANCED property for variable: QT_DOC_DIR QT_DOC_DIR-ADVANCED:INTERNAL=1 -QT_HEADERS_DIR:INTERNAL=C:/3rdPartyLibs/VC12-32/QT-4.8.4/include //ADVANCED property for variable: QT_IMPORTS_DIR QT_IMPORTS_DIR-ADVANCED:INTERNAL=1 //ADVANCED property for variable: QT_LIBRARY_DIR QT_LIBRARY_DIR-ADVANCED:INTERNAL=1 -//Qt library dir -QT_LIBRARY_DIR:INTERNAL=C:/3rdPartyLibs/VC12-32/QT-4.8.4/lib //ADVANCED property for variable: QT_LINGUIST_EXECUTABLE QT_LINGUIST_EXECUTABLE-ADVANCED:INTERNAL=1 //ADVANCED property for variable: QT_LRELEASE_EXECUTABLE @@ -1698,11 +1068,12 @@ _Boost_ADDITIONAL_VERSIONS_LAST:INTERNAL=1.56.1;1.56.0;1.56;1.55.1;1.55.0;1.55;1 //Components requested for this build tree. _Boost_COMPONENTS_SEARCHED:INTERNAL=system;thread //Last used Boost_INCLUDE_DIR value. -_Boost_INCLUDE_DIR_LAST:INTERNAL=C:/3rdPartyLibs/boost_1_55_0 +_Boost_INCLUDE_DIR_LAST:INTERNAL=C:/3rdPartyLibs/boost_1_57_0 //Last used Boost_LIBRARY_DIR value. -_Boost_LIBRARY_DIR_LAST:INTERNAL=C:/3rdPartyLibs/boost_1_55_0/lib32 +_Boost_LIBRARY_DIR_LAST:INTERNAL=C:/3rdPartyLibs/boost_1_57_0/lib32 //Last used Boost_USE_MULTITHREADED value. _Boost_USE_MULTITHREADED_LAST:INTERNAL=TRUE //Last used Boost_USE_STATIC_LIBS value. _Boost_USE_STATIC_LIBS_LAST:INTERNAL=OFF + diff --git a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Debug-32bits/setup b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Debug-32bits/setup index 98dbc27c772..64ded83e00a 100644 --- a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Debug-32bits/setup +++ b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Debug-32bits/setup @@ -2,5 +2,6 @@ export CGAL_DIR='/cygdrive/c/CGAL/reference_platforms/x64_Cygwin-Windows8_MSVC20 export VC_VERSION="12" export ARCH="32" export PLATFORM_REFERENCE="/cygdrive/c/CGAL/reference_platforms" -export BOOST_VERSION=1_55_0 +export BOOST_VERSION=1_57_0 source "${PLATFORM_REFERENCE}/setup_common" + diff --git a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Debug-64bits/CMakeCache.txt b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Debug-64bits/CMakeCache.txt index 0f7a291a83b..0eb19056b94 100644 --- a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Debug-64bits/CMakeCache.txt +++ b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Debug-64bits/CMakeCache.txt @@ -1706,3 +1706,4 @@ _Boost_USE_MULTITHREADED_LAST:INTERNAL=TRUE //Last used Boost_USE_STATIC_LIBS value. _Boost_USE_STATIC_LIBS_LAST:INTERNAL=OFF + diff --git a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Debug-64bits/setup b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Debug-64bits/setup index b21fc3b35be..5ad93f6fb4f 100644 --- a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Debug-64bits/setup +++ b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Debug-64bits/setup @@ -4,3 +4,4 @@ export ARCH="64" export PLATFORM_REFERENCE="/cygdrive/c/CGAL/reference_platforms" export BOOST_VERSION=1_55_0 source "${PLATFORM_REFERENCE}/setup_common" + diff --git a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Release-32bits/CMakeCache.txt b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Release-32bits/CMakeCache.txt index 66fc33ae61e..524da1c032a 100644 --- a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Release-32bits/CMakeCache.txt +++ b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Release-32bits/CMakeCache.txt @@ -144,19 +144,19 @@ CMAKE_C_FLAGS_RELWITHDEBINFO:STRING=/MD /O2 /Ob1 CMAKE_C_STANDARD_LIBRARIES:STRING=kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib //Flags used by the linker. -CMAKE_EXE_LINKER_FLAGS:STRING=' /machine:X86 ' +CMAKE_EXE_LINKER_FLAGS:STRING=' /machine:X86 /INCREMENTAL:NO /DEBUG:NONE' //Flags used by the linker during debug builds. -CMAKE_EXE_LINKER_FLAGS_DEBUG:STRING=/debug /INCREMENTAL +CMAKE_EXE_LINKER_FLAGS_DEBUG:STRING= //Flags used by the linker during release minsize builds. -CMAKE_EXE_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO +CMAKE_EXE_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO /DEBUG:NONE //Flags used by the linker during release builds. -CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO +CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO /DEBUG:NONE //Flags used by the linker during Release with Debug Info builds. -CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL +CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING= //Install path prefix, prepended onto install directories. CMAKE_INSTALL_PREFIX:PATH=C:/Program Files (x86)/CGAL @@ -168,19 +168,19 @@ CMAKE_LINKER:FILEPATH=C:/Program Files (x86)/Microsoft Visual Studio 12.0/VC/bin CMAKE_MAKE_PROGRAM:STRING=nmake //Flags used by the linker during the creation of modules. -CMAKE_MODULE_LINKER_FLAGS:STRING=' /machine:X86 ' +CMAKE_MODULE_LINKER_FLAGS:STRING=' /machine:X86 /DEBUG:NONE /INCREMENTAL:NO' //Flags used by the linker during debug builds. -CMAKE_MODULE_LINKER_FLAGS_DEBUG:STRING=/debug /INCREMENTAL +CMAKE_MODULE_LINKER_FLAGS_DEBUG:STRING= //Flags used by the linker during release minsize builds. -CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO +CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL:STRING= //Flags used by the linker during release builds. -CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO +CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING= //Flags used by the linker during Release with Debug Info builds. -CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL +CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/DEBUG:NONE /INCREMENTAL:NO //Value Computed by CMake CMAKE_PROJECT_NAME:STATIC=CGAL @@ -192,19 +192,19 @@ CMAKE_RC_COMPILER:FILEPATH=C:/Program Files (x86)/Windows Kits/8.1/bin/x86/rc.ex CMAKE_RC_FLAGS:STRING=' ' //Flags used by the linker during the creation of dll's. -CMAKE_SHARED_LINKER_FLAGS:STRING=' /machine:X86 ' +CMAKE_SHARED_LINKER_FLAGS:STRING=' /machine:X86 /DEBUG:NONE /INCREMENTAL:NO' //Flags used by the linker during debug builds. -CMAKE_SHARED_LINKER_FLAGS_DEBUG:STRING=/debug /INCREMENTAL +CMAKE_SHARED_LINKER_FLAGS_DEBUG:STRING= //Flags used by the linker during release minsize builds. -CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO +CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL:STRING= //Flags used by the linker during release builds. -CMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO +CMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING= //Flags used by the linker during Release with Debug Info builds. -CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL +CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING= //If set, runtime paths are not added when installing shared libraries, // but are added when building. @@ -1688,3 +1688,4 @@ _Boost_USE_MULTITHREADED_LAST:INTERNAL=TRUE //Last used Boost_USE_STATIC_LIBS value. _Boost_USE_STATIC_LIBS_LAST:INTERNAL=OFF + diff --git a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Release-32bits/setup b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Release-32bits/setup index 6a4f1cc5007..6487b1b8878 100644 --- a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Release-32bits/setup +++ b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Release-32bits/setup @@ -5,3 +5,8 @@ export PLATFORM_REFERENCE="/cygdrive/c/CGAL/reference_platforms" export BOOST_VERSION=1_57_0 export TBB_ARCH="ia32" source "${PLATFORM_REFERENCE}/setup_common" + + +COLLECT_DEMOS_BINARIES=y +export COLLECT_DEMOS_BINARIES + diff --git a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Release-64bits/CMakeCache.txt b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Release-64bits/CMakeCache.txt index 2f384b9880a..d719193d9d4 100644 --- a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Release-64bits/CMakeCache.txt +++ b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Release-64bits/CMakeCache.txt @@ -1688,3 +1688,4 @@ _Boost_USE_MULTITHREADED_LAST:INTERNAL=TRUE //Last used Boost_USE_STATIC_LIBS value. _Boost_USE_STATIC_LIBS_LAST:INTERNAL=OFF + diff --git a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Release-64bits/setup b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Release-64bits/setup index d46407016a2..ff34a4e270b 100644 --- a/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Release-64bits/setup +++ b/Maintenance/infrastructure/picasso.geometryfactory.com/reference_platforms/x64_Cygwin-Windows8_MSVC2013-Release-64bits/setup @@ -5,3 +5,4 @@ export PLATFORM_REFERENCE="/cygdrive/c/CGAL/reference_platforms" export BOOST_VERSION=1_57_0 export TBB_ARCH="intel64" source "${PLATFORM_REFERENCE}/setup_common" + diff --git a/Maintenance/public_release/scripts/prepare_release b/Maintenance/public_release/scripts/prepare_release index 9594509588f..afdb3f59ee3 100755 --- a/Maintenance/public_release/scripts/prepare_release +++ b/Maintenance/public_release/scripts/prepare_release @@ -35,7 +35,7 @@ printf "Copy documentation to doc_html/ and doc_html_online/...\n" [ -d "/srv/CGAL/www/${PUBLIC_RELEASE_NAME#CGAL-}/Manual" ] || mkdir -p "/srv/CGAL/www/${PUBLIC_RELEASE_NAME#CGAL-}/Manual" cp "$PUBLIC_RELEASE_DIR"/*(.) "${RELEASE_CANDIDATES_DIR}/$PUBLIC_RELEASE_NAME" -rsync -a "$MANUAL_TESTS_DIR/$INTERNAL_RELEASE"/output/* "$DEST_DIR/doc_html/" +rsync -a "$MANUAL_TESTS_DIR/$INTERNAL_RELEASE"/output2/* "$DEST_DIR/doc_html/" pushd "$DEST_DIR/doc_html/Manual/search" for i in g n c s i; do sed -i "s/..\/BGL$i/..\/BGL\/$i/g" *; done popd diff --git a/Matrix_search/package_info/Matrix_search/dependencies b/Matrix_search/package_info/Matrix_search/dependencies new file mode 100644 index 00000000000..f55558679bb --- /dev/null +++ b/Matrix_search/package_info/Matrix_search/dependencies @@ -0,0 +1,12 @@ + +Algebraic_foundations +Installation +Interval_support +Kernel_23 +Matrix_search +Modular_arithmetic +Number_types +Optimisation_basic +Profiling_tools +STL_Extension +Stream_support diff --git a/Mesh_2/package_info/Mesh_2/dependencies b/Mesh_2/package_info/Mesh_2/dependencies new file mode 100644 index 00000000000..08c3dd3037c --- /dev/null +++ b/Mesh_2/package_info/Mesh_2/dependencies @@ -0,0 +1,17 @@ + +Algebraic_foundations +Circulator +Distance_2 +Hash_map +Installation +Interval_support +Kernel_23 +Mesh_2 +Mesher_level +Modular_arithmetic +Number_types +Profiling_tools +STL_Extension +Stream_support +TDS_2 +Triangulation_2 diff --git a/Mesh_3/package_info/Mesh_3/dependencies b/Mesh_3/package_info/Mesh_3/dependencies new file mode 100644 index 00000000000..c32cdbf721d --- /dev/null +++ b/Mesh_3/package_info/Mesh_3/dependencies @@ -0,0 +1,46 @@ + +AABB_tree +Algebraic_foundations +Arithmetic_kernel +BGL +Box_intersection_d +CGAL_ImageIO +Cartesian_kernel +Circulator +Convex_hull_2 +Distance_2 +Distance_3 +Filtered_kernel +Generator +HalfedgeDS +Hash_map +Homogeneous_kernel +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Kernel_d +Mesh_3 +Mesher_level +Modifier +Modular_arithmetic +Number_types +Polygon +Polygon_mesh_processing +Polyhedron +Polyhedron_IO +Principal_component_analysis +Principal_component_analysis_LGPL +Profiling_tools +Property_map +Random_numbers +STL_Extension +Solver_interface +Spatial_searching +Spatial_sorting +Stream_support +Surface_mesh +TDS_3 +Triangulation_3 +Union_find diff --git a/Mesher_level/package_info/Mesher_level/dependencies b/Mesher_level/package_info/Mesher_level/dependencies new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Minkowski_sum_2/package_info/Minkowski_sum_2/dependencies b/Minkowski_sum_2/package_info/Minkowski_sum_2/dependencies new file mode 100644 index 00000000000..bf713ab7437 --- /dev/null +++ b/Minkowski_sum_2/package_info/Minkowski_sum_2/dependencies @@ -0,0 +1,36 @@ + +AABB_tree +Algebraic_foundations +Arithmetic_kernel +Arrangement_on_surface_2 +Boolean_set_operations_2 +Cartesian_kernel +Circulator +Convex_hull_2 +Distance_2 +Distance_3 +Filtered_kernel +HalfedgeDS +Hash_map +Homogeneous_kernel +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Kernel_d +Minkowski_sum_2 +Modular_arithmetic +Number_types +Partition_2 +Polygon +Profiling_tools +Property_map +STL_Extension +Spatial_searching +Spatial_sorting +Stream_support +Surface_sweep_2 +TDS_2 +Triangulation_2 +Union_find diff --git a/Minkowski_sum_3/package_info/Minkowski_sum_3/dependencies b/Minkowski_sum_3/package_info/Minkowski_sum_3/dependencies new file mode 100644 index 00000000000..42380f29e6b --- /dev/null +++ b/Minkowski_sum_3/package_info/Minkowski_sum_3/dependencies @@ -0,0 +1,38 @@ + +Algebraic_foundations +Arithmetic_kernel +BGL +Box_intersection_d +Cartesian_kernel +Circulator +Convex_decomposition_3 +Distance_2 +Distance_3 +Filtered_kernel +HalfedgeDS +Hash_map +Homogeneous_kernel +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Kernel_d +Minkowski_sum_3 +Modifier +Modular_arithmetic +Nef_2 +Nef_3 +Nef_S2 +Number_types +Polygon +Polyhedron +Polyhedron_IO +Profiling_tools +Property_map +STL_Extension +Spatial_sorting +Stream_support +TDS_2 +Triangulation_2 +Union_find diff --git a/Modifier/package_info/Modifier/dependencies b/Modifier/package_info/Modifier/dependencies new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Modular_arithmetic/package_info/Modular_arithmetic/dependencies b/Modular_arithmetic/package_info/Modular_arithmetic/dependencies new file mode 100644 index 00000000000..e323621c3b0 --- /dev/null +++ b/Modular_arithmetic/package_info/Modular_arithmetic/dependencies @@ -0,0 +1,10 @@ + +Algebraic_foundations +Installation +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +Profiling_tools +STL_Extension +Stream_support diff --git a/Nef_2/package_info/Nef_2/dependencies b/Nef_2/package_info/Nef_2/dependencies new file mode 100644 index 00000000000..0d4b5c9d084 --- /dev/null +++ b/Nef_2/package_info/Nef_2/dependencies @@ -0,0 +1,24 @@ + +Algebraic_foundations +Box_intersection_d +Cartesian_kernel +Circulator +Distance_2 +Distance_3 +HalfedgeDS +Hash_map +Homogeneous_kernel +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Kernel_d +Modular_arithmetic +Nef_2 +Number_types +Polygon +Profiling_tools +STL_Extension +Stream_support +Union_find diff --git a/Nef_3/package_info/Nef_3/dependencies b/Nef_3/package_info/Nef_3/dependencies new file mode 100644 index 00000000000..15eb76c3eec --- /dev/null +++ b/Nef_3/package_info/Nef_3/dependencies @@ -0,0 +1,36 @@ + +Algebraic_foundations +Arithmetic_kernel +BGL +Box_intersection_d +Cartesian_kernel +Circulator +Distance_2 +Distance_3 +Filtered_kernel +HalfedgeDS +Hash_map +Homogeneous_kernel +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Kernel_d +Modifier +Modular_arithmetic +Nef_2 +Nef_3 +Nef_S2 +Number_types +Polygon +Polyhedron +Polyhedron_IO +Profiling_tools +Property_map +STL_Extension +Spatial_sorting +Stream_support +TDS_2 +Triangulation_2 +Union_find diff --git a/Nef_S2/package_info/Nef_S2/dependencies b/Nef_S2/package_info/Nef_S2/dependencies new file mode 100644 index 00000000000..9ee21f837ea --- /dev/null +++ b/Nef_S2/package_info/Nef_S2/dependencies @@ -0,0 +1,19 @@ + +Algebraic_foundations +Circulator +Distance_2 +Hash_map +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Modifier +Modular_arithmetic +Nef_2 +Nef_S2 +Number_types +Profiling_tools +STL_Extension +Stream_support +Union_find diff --git a/NewKernel_d/package_info/NewKernel_d/dependencies b/NewKernel_d/package_info/NewKernel_d/dependencies new file mode 100644 index 00000000000..9c68d7b6935 --- /dev/null +++ b/NewKernel_d/package_info/NewKernel_d/dependencies @@ -0,0 +1,13 @@ + +Algebraic_foundations +Arithmetic_kernel +Filtered_kernel +Installation +Interval_support +Kernel_23 +Modular_arithmetic +NewKernel_d +Number_types +Profiling_tools +STL_Extension +Stream_support diff --git a/Number_types/package_info/Number_types/dependencies b/Number_types/package_info/Number_types/dependencies new file mode 100644 index 00000000000..111902e1d3a --- /dev/null +++ b/Number_types/package_info/Number_types/dependencies @@ -0,0 +1,13 @@ + +Algebraic_foundations +Arithmetic_kernel +CGAL_Core +Filtered_kernel +Installation +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +Profiling_tools +STL_Extension +Stream_support diff --git a/OpenNL/package_info/OpenNL/dependencies b/OpenNL/package_info/OpenNL/dependencies new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Operations_on_polyhedra/package_info/Operations_on_polyhedra/dependencies b/Operations_on_polyhedra/package_info/Operations_on_polyhedra/dependencies new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Optimal_transportation_reconstruction_2/include/CGAL/Optimal_transportation_reconstruction_2.h b/Optimal_transportation_reconstruction_2/include/CGAL/Optimal_transportation_reconstruction_2.h index 92bad3514c0..6553bea8450 100644 --- a/Optimal_transportation_reconstruction_2/include/CGAL/Optimal_transportation_reconstruction_2.h +++ b/Optimal_transportation_reconstruction_2/include/CGAL/Optimal_transportation_reconstruction_2.h @@ -1779,6 +1779,8 @@ public: /// \cond SKIP_IN_MANUAL + const Triangulation& tds() const { return m_dt; } + void extract_tds_output(Triangulation& rt2) const { rt2 = m_dt; //mark vertices diff --git a/Optimal_transportation_reconstruction_2/package_info/Optimal_transportation_reconstruction_2/dependencies b/Optimal_transportation_reconstruction_2/package_info/Optimal_transportation_reconstruction_2/dependencies new file mode 100644 index 00000000000..91782b70d55 --- /dev/null +++ b/Optimal_transportation_reconstruction_2/package_info/Optimal_transportation_reconstruction_2/dependencies @@ -0,0 +1,23 @@ + +Algebraic_foundations +Circulator +Distance_2 +Filtered_kernel +Hash_map +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +Optimal_transportation_reconstruction_2 +Polygon +Profiling_tools +Property_map +Random_numbers +STL_Extension +Spatial_sorting +Stream_support +TDS_2 +Triangulation_2 diff --git a/Optimal_transportation_reconstruction_2/test/Optimal_transportation_reconstruction_2/test_vertex_edge.cpp b/Optimal_transportation_reconstruction_2/test/Optimal_transportation_reconstruction_2/test_vertex_edge.cpp index 57520032817..53b59e58934 100644 --- a/Optimal_transportation_reconstruction_2/test/Optimal_transportation_reconstruction_2/test_vertex_edge.cpp +++ b/Optimal_transportation_reconstruction_2/test/Optimal_transportation_reconstruction_2/test_vertex_edge.cpp @@ -67,14 +67,16 @@ void test_edge_collapse() CGAL::Optimal_transportation_reconstruction_2 otr2(points, point_pmap, mass_pmap); - Rt_2 rt2; - otr2.extract_tds_output(rt2); + const Rt_2& rt2 = otr2.tds(); FT min_priority = 1000; R_edge_2 contract_edge; for (Finite_edges_iterator ei = rt2.finite_edges_begin(); ei != rt2.finite_edges_end(); ++ei) { + if (rt2.is_pinned(*ei) || rt2.is_target_cyclic(*ei)) + continue; + R_edge_2 cur_r_edge; if(!otr2.create_pedge(*ei, cur_r_edge)) continue; diff --git a/Optimisation_basic/package_info/Optimisation_basic/dependencies b/Optimisation_basic/package_info/Optimisation_basic/dependencies new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Partition_2/package_info/Partition_2/dependencies b/Partition_2/package_info/Partition_2/dependencies new file mode 100644 index 00000000000..e09b876feea --- /dev/null +++ b/Partition_2/package_info/Partition_2/dependencies @@ -0,0 +1,24 @@ + +Algebraic_foundations +Circulator +Convex_hull_2 +Distance_2 +Distance_3 +Filtered_kernel +Hash_map +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +Partition_2 +Polygon +Profiling_tools +Property_map +STL_Extension +Spatial_sorting +Stream_support +TDS_2 +Triangulation_2 diff --git a/Periodic_2_triangulation_2/package_info/Periodic_2_triangulation_2/dependencies b/Periodic_2_triangulation_2/package_info/Periodic_2_triangulation_2/dependencies new file mode 100644 index 00000000000..696981edc0d --- /dev/null +++ b/Periodic_2_triangulation_2/package_info/Periodic_2_triangulation_2/dependencies @@ -0,0 +1,24 @@ + +Algebraic_foundations +Cartesian_kernel +Circulator +Distance_2 +Distance_3 +Filtered_kernel +Hash_map +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +Periodic_2_triangulation_2 +Polygon +Profiling_tools +Property_map +STL_Extension +Spatial_sorting +Stream_support +TDS_2 +Triangulation_2 diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt index feb38419680..47b911088b6 100644 --- a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt +++ b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt @@ -67,7 +67,7 @@ if (CGAL_FOUND AND CGAL_Qt5_FOUND AND Qt5_FOUND AND QGLVIEWER_FOUND AND TARGET Q add_to_cached_list( CGAL_EXECUTABLE_TARGETS periodic_3_triangulation_3_demo) target_link_libraries(periodic_3_triangulation_3_demo PRIVATE - CGAL::CGAL CGAL::CGAL_Qt5 Qt5::OpenGL Qt5::Help ${QGLVIEWER_LIBRARIES}) + CGAL::CGAL CGAL::CGAL_Qt5 Qt5::OpenGL ${QGLVIEWER_LIBRARIES}) include(${CGAL_MODULES_DIR}/CGAL_add_test.cmake) cgal_add_compilation_test(periodic_3_triangulation_3_demo) diff --git a/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/CMakeLists.txt b/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/CMakeLists.txt index 413d9163a24..ac6c2b0021d 100644 --- a/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/CMakeLists.txt +++ b/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/CMakeLists.txt @@ -59,7 +59,7 @@ if ( CGAL_FOUND AND CGAL_Qt5_FOUND AND Qt5_FOUND AND QGLVIEWER_FOUND AND TARGET add_to_cached_list( CGAL_EXECUTABLE_TARGETS Periodic_Lloyd_3 ) target_link_libraries( Periodic_Lloyd_3 PRIVATE - CGAL::CGAL CGAL::CGAL_Qt5 Qt5::OpenGL Qt5::Help + CGAL::CGAL CGAL::CGAL_Qt5 Qt5::OpenGL ${QGLVIEWER_LIBRARIES} ) include(${CGAL_MODULES_DIR}/CGAL_add_test.cmake) diff --git a/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3DelaunayTriangulationTraits_3.h b/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3DelaunayTriangulationTraits_3.h index ea9b39353a3..12b9c3b9704 100644 --- a/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3DelaunayTriangulationTraits_3.h +++ b/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3DelaunayTriangulationTraits_3.h @@ -34,12 +34,7 @@ public: /// @{ /*! -A predicate object that must provide the function operators - -`Oriented_side operator()(Point_3 p, Point_3 q, Point_3 r, Point_3 s, Point_3 t)`, - -which determines on which side of the oriented sphere circumscribing -`p, q, r, s` the point `t` lies and +A predicate object that must provide the function operator `Oriented_side operator()(Point_3 p, Point_3 q, Point_3 r, Point_3 s, Point_3 t, Periodic_3_offset_3 o_p, Periodic_3_offset_3 o_q, Periodic_3_offset_3 o_r, Periodic_3_offset_3 o_s, Periodic_3_offset_3 o_t)`, @@ -51,12 +46,7 @@ which determines on which side of the oriented sphere circumscribing typedef unspecified_type Side_of_oriented_sphere_3; /*! -A predicate object that must provide the function operators - -`Comparison_result operator()(Point_3 p, Point_3 q, Point_3 r)`, - -which compares the distance between `p` and `q` to the distance -between `p` and `r` and +A predicate object that must provide the function operator `Comparison_result operator()(Point_3 p, Point_3 q, Point_3 r, Periodic_3_offset_3 o_p, Periodic_3_offset_3 o_q, Periodic_3_offset_3 o_r)`, @@ -73,13 +63,7 @@ typedef unspecified_type Compare_distance_3; /// @{ /*! -A predicate object that must provide the function operators - -`Orientation operator()(Point_3 p, Point_3 q, Point_3 r)`, - -which returns `COLLINEAR`, if the points are collinear; otherwise -it must return a consistent orientation for any three points chosen in -a same plane and +A predicate object that must provide the function operator `Orientation operator()(Point_3 p, Point_3 q, Point_3 r Periodic_3_offset_3 o_p, Periodic_3_offset_3 o_q, Periodic_3_offset_3 o_r)`, @@ -91,12 +75,7 @@ three point-offset pairs chosen in a same plane. typedef unspecified_type Coplanar_orientation_3; /*! -A predicate object that must provide the function operators - -`Bounded_side operator()(Point_3 p, Point_3 q, Point_3 r, Point_3 s)`, - -which determines the bounded side of the circle defined by `p, q`, -and `r` on which the point `s` lies and +A predicate object that must provide the function operator `Bounded_side operator()(Point_3 p, Point_3 q, Point_3 r, Point_3 s, Periodic_3_offset_3 o_p, Periodic_3_offset_3 o_q, Periodic_3_offset_3 o_r, Periodic_3_offset_3 o_s)`, @@ -115,42 +94,19 @@ typedef unspecified_type Coplanar_side_of_bounded_circle_3; /// @{ /*! -A predicate object that must provide the function operators - -`Bounded_side operator()(Point_3 p, Point_3 q, Point_3 t)`, - -which returns the position of the point `t` relative to the sphere -that has `pq` as its diameter, +A predicate object that must provide the function operator `Bounded_side operator()(Point_3 p, Point_3 q, Point_3 t, Periodic_3_offset_3 o_p, Periodic_3_offset_3 o_q, Periodic_3_offset_3 o_t)`, which returns the position of the point-offset pair `(t,o_t)` relative to the sphere that has `(p,o_p)(q,o_q)` as its diameter, -`Bounded_side operator()(Point_3 p, Point_3 q, Point_3 r, Point_3 t)`, - -which returns the position of the point `t` relative to the sphere -passing through `p, q`, and `r` and whose center is in the -plane defined by these three points, - `Bounded_side operator()(Point_3 p, Point_3 q, Point_3 r, Point_3 t, Periodic_3_offset_3 o_p, Periodic_3_offset_3 o_q, Periodic_3_offset_3 o_r, Periodic_3_offset_3 o_q)`, which returns the position of the point-offset pair `(t,o_t)` relative to the sphere passing through `(p,o_p), (q,o_q)`, and `(r,o_r)` and whose center is in the plane defined by these three -point-offset pairs, - -`Bounded_side operator()(Point_3 p, Point_3 q, Point_3 r, Point_3 s, Point_3 t)`, - -which returns the relative position of point `t` to the sphere -defined by `p, q, r`, and `s`; the order of the points `p, q, r`, and `s` does not matter, and - -`Bounded_side operator()(Point_3 p, Point_3 q, Point_3 r, Point_3 s, Point_3 t, Periodic_3_offset_3 o_p, Periodic_3_offset_3 o_q, Periodic_3_offset_3 o_r, Periodic_3_offset_3 o_s, Periodic_3_offset_3 o_q)`, - -which returns the relative position of the point-offset pair -`(t,o_t)` to the sphere defined by `(p,o_p), (q,o_q), (r,o_r)`, and `(s,o_s)`; the order of the point-offset pairs -`(p,o_p), (q,o_q), (r,o_r)`, and `(s,o_s)` does not matter. -\pre `p, q, r`, and `s` are not coplanar, `(p,o_p), (q,o_q), (r,o_r)`, and `(s,o_s)` are not coplanar, `p`, `q`, `r`, `s`, `t` lie inside the domain. +point-offset pairs. */ typedef unspecified_type Side_of_bounded_sphere_3; @@ -162,11 +118,7 @@ typedef unspecified_type Side_of_bounded_sphere_3; /// @{ /*! -A constructor object that must provide the function operators - -`Point_3 operator()(Point_3 p, Point_3 q, Point_3 r, Point_3 s)`, - -which constructs the circumcenter of four points and +A constructor object that must provide the function operator `Point_3 operator()(Point_3 p, Point_3 q, Point_3 r, Point_3 s, Periodic_3_offset_3 o_p, Periodic_3_offset_3 o_q, Periodic_3_offset_3 o_r, Periodic_3_offset_3 o_s)`, diff --git a/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3RegularTriangulationTraits_3.h b/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3RegularTriangulationTraits_3.h index 0c2e6e0d919..9f7ffb809eb 100644 --- a/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3RegularTriangulationTraits_3.h +++ b/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3RegularTriangulationTraits_3.h @@ -34,58 +34,41 @@ public: /// @{ /*! -A predicate object that must provide the function operators: - -`Oriented_side operator()(Weighted_point_3 p, Weighted_point_3 q, Weighted_point_3 r, Weighted_point_3 s, Weighted_point_3 t)`, - -which determines the position of `t` with respect to the power sphere of `p, q, r, s`. +A predicate object that must provide the function operators `Oriented_side operator()(Weighted_point_3 p, Weighted_point_3 q, Weighted_point_3 r, Weighted_point_3 s, Weighted_point_3 t, Periodic_3_offset_3 o_p, Periodic_3_offset_3 o_q, Periodic_3_offset_3 o_r, Periodic_3_offset_3 o_s, Periodic_3_offset_3 o_t)`, -which is the same for the point-offset pair `(t,o_t)` with respect to the power sphere of the point-offset pairs -`(p,o_p), (q,o_q), (r,o_r), (s,o_s)`. +which determines the position of the point-offset pair `(t,o_t)` with respect +to the power sphere of the point-offset pairs `(p,o_p), (q,o_q), (r,o_r), (s,o_s)`. \pre `p`, `q`, `r`, `s`, `t` lie inside the domain and `p, q, r, s` are not coplanar.
-When vertex removal is used, the predicate must in addition provide the following function operators: +When vertex removal is used, the predicate must in addition provide the function operators -`Oriented_side operator()( Weighted_point_3 p, Weighted_point_3 q, Weighted_point_3 r, Weighted_point_3 t)`, +`Oriented_side operator()(Weighted_point_3 p, Weighted_point_3 q, Weighted_point_3 r, Weighted_point_3 t, + Periodic_3_offset_3 o_p, Periodic_3_offset_3 o_q, Periodic_3_offset_3 o_r, Periodic_3_offset_3 o_t)`, which has a definition similar to the previous method, for coplanar points, with the power circle of `p,q,r`. +\pre `p`, `q`, `r`, `t` lie inside the domain, `p, q, r` are not collinear, +and `(p,o_p), (q,o_q), (r,o_r), (t,o_t)` are coplanar. -`Oriented_side operator()( Weighted_point_3 p, Weighted_point_3 q, Weighted_point_3 r, Weighted_point_3 t, -Periodic_3_offset_3 o_p, Periodic_3_offset_3 o_q, Periodic_3_offset_3 o_r, Periodic_3_offset_3 o_t)`, +`Oriented_side operator()(Weighted_point_3 p, Weighted_point_3 q, Weighted_point_3 t, + Periodic_3_offset_3 o_p, Periodic_3_offset_3 o_q, Periodic_3_offset_3 o_t)`, -which is the same for point-offset pairs. +which is the same for collinear points, and the power segment of `(p,o_p)` and `(q,o_q)`, -\pre `p`, `q`, `r`, `t` lie inside the domain, `p, q, r` are not collinear, and `p, q, r, t` are coplanar. +\pre `p`, `q`, `t` lie inside the domain, `p` and `q` have different Bare_points, and +`(p,o_p), (q,o_q), (t,o_t)` are collinear. +`Oriented_side operator()(Weighted_point_3 p, Weighted_point_3 q, + Periodic_3_offset_3 o_p, Periodic_3_offset_3 o_q)`, -`Oriented_side operator()( Weighted_point_3 p, Weighted_point_3 q, Weighted_point_3 t)`, - -which is the same for collinear points, and the power segment of `p` and `q`, - -`Oriented_side operator()( Weighted_point_3 p, Weighted_point_3 q, Weighted_point_3 t, -Periodic_3_offset_3 o_p, Periodic_3_offset_3 o_q, Periodic_3_offset_3 o_t)`, - -which is the same for point-offset pairs. - -\pre `p`, `q`, `t` lie inside the domain, `p` and `q` have different Bare_points, and `p, q, t` are collinear. - - -`Oriented_side operator()( Weighted_point_3 p, Weighted_point_3 q)`, - -which is the same for equal points, that is when `p` and `q` +which is the same for equal points, that is when `(p,o_p)` and `(q,o_q)` have equal coordinates, then it returns the comparison of the weights. -`Oriented_side operator()( Weighted_point_3 p, Weighted_point_3 q, -Periodic_3_offset_3 o_p, Periodic_3_offset_3 o_q)`, - -which is the same for point-offset pairs. - \pre `p` and `q` lie inside the domain and have equal Bare_points. */ @@ -118,15 +101,11 @@ typedef unspecified_type Compare_weighted_squared_radius_3; A predicate object, model of `ComparePowerDistance_3`, that must provide the function operator -`Comparison_result operator()(Point_3 p, Weighted_point_3 q, Weighted_point_3 r)`, - -which compares the power distance between `p` and `q` to the power distance -between `p` and `r` and - `Comparison_result operator()(Point_3 p, Weighted_point_3 q, Weighted_point_3 r, -Periodic_3_offset_3 o_p, Periodic_3_offset_3 o_q, Periodic_3_offset_3 o_r)`, + Periodic_3_offset_3 o_p, Periodic_3_offset_3 o_q, Periodic_3_offset_3 o_r)`, -which is the same for point-offset pairs. +which compares the power distance between `(p,o_p)` and `(q,o_q)` to the power distance +between `(p,o_p)` and `(r,o_r)`. \note This predicate is required if a call to `nearest_power_vertex()` or `nearest_power_vertex_in_cell()` is issued.*/ @@ -157,23 +136,51 @@ typedef unspecified_type Coplanar_orientation_3; /// @} +/// \name +/// When `is_Gabriel` functions are used, the traits class must +/// in addition provide the following predicate object: +/// @{ + +/*! +A predicate object that must provide the function operator + +`Bounded_side operator()(Weighted_point_3 p, Weighted_point_3 t, + Periodic_3_offset_3 o_p, Periodic_3_offset_3 o_t)`, + +which returns the sign of the power test of `(t,o_t)` with respect to the smallest +sphere orthogonal to `(p,o_p)` (which is the sphere with center `(p,o_p)` and squared +radius `-w_p` with `w_p` the weight of `p`), + +`Bounded_side operator()(Weighted_point_3 p, Weighted_point_3 q, Weighted_point_3 t, + Periodic_3_offset_3 o_p, Periodic_3_offset_3 o_q, Periodic_3_offset_3 o_t)`, + +which returns the sign of the power test of `(t,o_t)` with respect to the smallest +sphere orthogonal to `(p,o_p)` and `(q,o_q)`, + +`Bounded_side operator()(Weighted_point_3 p, Weighted_point_3 q, Weighted_point_3 r, Weighted_point_3 t, + Periodic_3_offset_3 o_p, Periodic_3_offset_3 o_q, Periodic_3_offset_3 o_r, Periodic_3_offset_3 o_q)`, + +which returns the sign of the power test of `(t,o_t)` with respect to the smallest +sphere orthogonal to `(p,o_p)`, `(q,o_q)`, and `(r,o_r)`. +*/ +typedef unspecified_type Power_side_of_bounded_power_sphere_3; + +/// @} + /// \name /// When the dual operations are used, the traits /// class must in addition provide the following constructor object: /// @{ /*! -A constructor object that must provide the function operators: - -`Weighted_point_3 operator()(Weighted_point_3 p, Weighted_point_3 q, Weighted_point_3 r, Weighted_point_3 s)`, - -which constructs the weighted circumcenter of four points and +A constructor object that must provide the function operator `Weighted_point_3 operator()(Weighted_point_3 p, Weighted_point_3 q, Weighted_point_3 r, Weighted_point_3 s, Periodic_3_offset_3 o_p, Periodic_3_offset_3 o_q, Periodic_3_offset_3 o_r, Periodic_3_offset_3 o_s)`, which constructs the weighted circumcenter of four point-offset pairs. -\pre `p`, `q`, `r` and `s` as well as `(p,o_p)`, `(q,o_q)`, `(r,o_r)` and `(s,o_s)` must be non coplanar. `p`, `q`, `r`, `s` lie inside the domain. +\pre `p`, `q`, `r`, `s` lie inside the domain. `p`, `q`, `r` and `s`, +as well as `(p,o_p)`, `(q,o_q)`, `(r,o_r)` and `(s,o_s)` must be non coplanar. */ typedef unspecified_type Construct_weighted_circumcenter_3; diff --git a/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3TriangulationTraits_3.h b/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3TriangulationTraits_3.h index d18e42be86d..ff7448b2e32 100644 --- a/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3TriangulationTraits_3.h +++ b/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3TriangulationTraits_3.h @@ -80,11 +80,7 @@ of `Kernel::Tetrahedron_3`. typedef unspecified_type Tetrahedron_3; /*! -A predicate object that must provide the function operators - -`Comparison_result operator()(Point_3 p, Point_3 q)`, - -which returns `EQUAL` if the two points are equal and +A predicate object that must provide the function operator `Comparison_result operator()(Point_3 p, Point_3 q, Periodic_3_offset_3 o_p, Periodic_3_offset_3 o_q)`, @@ -96,14 +92,7 @@ in a same line. typedef unspecified_type Compare_xyz_3; /*! -A predicate object that must provide the function operators - -`Orientation operator()(Point_3 p, Point_3 q, Point_3 r, Point_3 s)`, - -which returns `POSITIVE`, if `s` lies on the positive side of -the oriented plane `h` defined by `p`, `q`, and `r`, -returns `NEGATIVE` if `s` lies on the negative side of -`h`, and returns `COPLANAR` if `s` lies on `h` and +A predicate object that must provide the function operator `Orientation operator()(Point_3 p, Point_3 q, Point_3 r, Point_3 s, Periodic_3_offset_3 o_p, Periodic_3_offset_3 o_q, Periodic_3_offset_3 o_r, Periodic_3_offset_3 o_s)`, @@ -134,11 +123,7 @@ which constructs a point from a point-offset pair. typedef unspecified_type Construct_point_3; /*! -A constructor object that must provide the function operators - -`Segment_3 operator()(Point_3 p, Point_3 q)`, - -which constructs a segment from two points and +A constructor object that must provide the function operator `Segment_3 operator()(Point_3 p, Point_3 q, Periodic_3_offset_3 o_p, Periodic_3_offset_3 o_q)`, @@ -148,11 +133,7 @@ which constructs a segment from two point-offset pairs. typedef unspecified_type Construct_segment_3; /*! -A constructor object that must provide the function operators - -`Triangle_3 operator()(Point_3 p, Point_3 q, Point_3 r )`, - -which constructs a triangle from three points and +A constructor object that must provide the function operator `Triangle_3 operator()(Point_3 p, Point_3 q, Point_3 r, Periodic_3_offset_3 o_q, Periodic_3_offset_3 o_q, Periodic_3_offset_3 o_r)`, @@ -162,11 +143,7 @@ which constructs a triangle from three point-offset pairs. typedef unspecified_type Construct_triangle_3; /*! -A constructor object that must provide the function operators - -`Tetrahedron_3 operator()(Point_3 p, Point_3 q, Point_3 r, Point_3 s)`, - -which constructs a tetrahedron from four points and +A constructor object that must provide the function operator `Tetrahedron_3 operator()(Point_3 p, Point_3 q, Point_3 r, Point_3 s, Periodic_3_offset_3 o_q, Periodic_3_offset_3 o_q, Periodic_3_offset_3 o_r, Periodic_3_offset_3 o_s)`, diff --git a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_regular_triangulation_3.h b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_regular_triangulation_3.h index 61b252dee1e..d9ab5f55d06 100644 --- a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_regular_triangulation_3.h +++ b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_regular_triangulation_3.h @@ -740,37 +740,96 @@ public: Vertex_handle nearest_power_vertex(const Bare_point& p, Cell_handle start) const { + CGAL_triangulation_precondition(p.x() < domain().xmax()); + CGAL_triangulation_precondition(p.y() < domain().ymax()); + CGAL_triangulation_precondition(p.z() < domain().zmax()); + CGAL_triangulation_precondition(p.x() >= domain().xmin()); + CGAL_triangulation_precondition(p.y() >= domain().ymin()); + CGAL_triangulation_precondition(p.z() >= domain().zmin()); + if(number_of_vertices() == 0) return Vertex_handle(); + typename Gt::Construct_weighted_point_3 p2wp = + geom_traits().construct_weighted_point_3_object(); + Locate_type lt; int li, lj; + Offset query_offset; + Cell_handle c = locate(p2wp(p), query_offset, lt, li, lj, start); - typename Gt::Construct_weighted_point_3 p2wp = - geom_traits().construct_weighted_point_3_object(); - Cell_handle c = locate(p2wp(p), lt, li, lj, start); - if(lt == Tr_Base::VERTEX) - return c->vertex(li); - const Conflict_tester tester(p2wp(p), this); - Offset o = combine_offsets(Offset(), get_location_offset(tester, c)); +#ifdef CGAL_PERIODIC_DEBUG_NEAREST_POWER_VERTEX + std::cout << "nearest power vertex: " << p << std::endl; + std::cout << "vertices: " << number_of_vertices() << std::endl; + std::cout << "stored vertices: " << this->number_of_stored_vertices() << std::endl; + std::cout << "Locate: " << p << std::endl; + std::cout << "Cell: " << &*c << std::endl; + std::cout << this->point(c, 0) << std::endl; + std::cout << this->point(c, 1) << std::endl; + std::cout << this->point(c, 2) << std::endl; + std::cout << this->point(c, 3) << std::endl; + std::cout << "offset query: " << query_offset << std::endl; + std::cout << "bounded side : " << geom_traits().bounded_side_3_object()( + Tetrahedron(this->point(c, 0).point(), this->point(c, 1).point(), + this->point(c, 2).point(), this->point(c, 3).point()), p) << std::endl; + std::cout << "power side: " << geom_traits().power_side_of_bounded_power_sphere_3_object()( + this->point(c, 0), this->point(c, 1), + this->point(c, 2), this->point(c, 3), p2wp(p)) << std::endl; + std::cout << "power distance: " << geom_traits().compute_power_distance_to_power_sphere_3_object()( + this->point(c, 0), this->point(c, 1), + this->point(c, 2), this->point(c, 3), p2wp(p)) << std::endl; +#endif // - start with the closest vertex from the located cell. // - repeatedly take the nearest of its incident vertices if any // - if not, we're done. - Vertex_handle nearest = nearest_vertex_in_cell(c, p, o); + + // Take the opposite because periodic_locate() returns the offset such that + // cell + offset contains 'p' but here we need to move 'p' + query_offset = this->combine_offsets(Offset(), -query_offset); + + Vertex_handle nearest = nearest_vertex_in_cell(c, p, query_offset); + Offset offset_of_nearest = get_min_dist_offset(p, query_offset, nearest); + +#ifdef CGAL_PERIODIC_DEBUG_NEAREST_POWER_VERTEX + std::cout << "nearest vertex in cell : " << &*nearest << " : " << nearest->point() << std::endl; + std::cout << "offset_of_nearest: " << offset_of_nearest << std::endl; +#endif + std::vector vs; vs.reserve(32); while(true) { Vertex_handle tmp = nearest; - Offset tmp_off = get_min_dist_offset(p, o, tmp); +#ifdef CGAL_PERIODIC_DEBUG_NEAREST_POWER_VERTEX + std::cout << "tmp set to : " << &*nearest << " : " << nearest->point() + << " || offset: " << nearest->offset() << std::endl; +#endif + adjacent_vertices(nearest, std::back_inserter(vs)); - for(typename std::vector::const_iterator vsit = vs.begin(); vsit != vs.end(); ++vsit) - tmp = (compare_distance(p, tmp->point(), (*vsit)->point(), - o, tmp_off, get_min_dist_offset(p, o, *vsit)) - == SMALLER) ? tmp : *vsit; + for(typename std::vector::const_iterator vsit = vs.begin(); + vsit != vs.end(); ++vsit) + { + // Can happen in 27-sheeted triangulations composed of few points + if((*vsit)->point() == nearest->point()) + continue; + + const Offset min_dist_offset = get_min_dist_offset(p, query_offset, *vsit); + if(compare_distance(p, (*vsit)->point(), tmp->point(), + query_offset, min_dist_offset, offset_of_nearest) == SMALLER) + { + tmp = *vsit; + offset_of_nearest = min_dist_offset; +#ifdef CGAL_PERIODIC_DEBUG_NEAREST_POWER_VERTEX + std::cout << " Closer adjacent vertex: " << &*tmp << " : " << tmp->point() + << " || offset " << offset_of_nearest << std::endl; +#endif + } + } + if(tmp == nearest) break; + vs.clear(); nearest = tmp; } @@ -841,7 +900,7 @@ public: return true; } - bool is_Gabriel(const Facet& f)const + bool is_Gabriel(const Facet& f) const { return is_Gabriel(f.first, f.second); } @@ -853,8 +912,20 @@ public: bool is_Gabriel(Vertex_handle v) const { - return nearest_power_vertex( - geom_traits().construct_point_3_object()(v->point()), v->cell()) == v; + typename Geom_traits::Power_side_of_bounded_power_sphere_3 + side_of_bounded_orthogonal_sphere = + geom_traits().power_side_of_bounded_power_sphere_3_object(); + + const Bare_point& bp = geom_traits().construct_point_3_object()(v->point()); + + Vertex_handle nearest_v = nearest_power_vertex(bp, v->cell()); + + // Need to find the offset such that power distance v->point() + // to nearest_v->point() is minimum + Offset nearest_v_off = get_min_dist_offset_general(bp, nearest_v); + + return (side_of_bounded_orthogonal_sphere( + v->point(), nearest_v->point(), Offset(), nearest_v_off) != CGAL::ON_BOUNDED_SIDE); } Offset get_min_dist_offset(const Bare_point& p, const Offset & o, @@ -885,6 +956,36 @@ public: return combine_offsets(mdo,min_off); } + // In this version, `p` must be in the domain, and we check all possible + // offsets to find the minimum + Offset get_min_dist_offset_general(const Bare_point& p, const Vertex_handle vh) const + { + CGAL_triangulation_precondition(p.x() < domain().xmax()); + CGAL_triangulation_precondition(p.y() < domain().ymax()); + CGAL_triangulation_precondition(p.z() < domain().zmax()); + CGAL_triangulation_precondition(p.x() >= domain().xmin()); + CGAL_triangulation_precondition(p.y() >= domain().ymin()); + CGAL_triangulation_precondition(p.z() >= domain().zmin()); + + Offset min_off = Offset(0,0,0); + + for(int i=-1; i<=1; ++i) { + for(int j=-1; j<=1; ++j) { + for(int k=-1; k<=1; ++k) + { + if(i==0 && j==0 && k==0) + continue; + + Offset loc_off(i, j, k); + if(compare_distance(p, vh->point(), vh->point(), Offset(), min_off, loc_off) == LARGER) + min_off = loc_off; + } + } + } + + return min_off; + } + Vertex_handle nearest_vertex_in_cell(const Cell_handle& c, const Bare_point& p, const Offset & o) const { diff --git a/Periodic_3_triangulation_3/package_info/Periodic_3_triangulation_3/dependencies b/Periodic_3_triangulation_3/package_info/Periodic_3_triangulation_3/dependencies new file mode 100644 index 00000000000..8da51d3b9ae --- /dev/null +++ b/Periodic_3_triangulation_3/package_info/Periodic_3_triangulation_3/dependencies @@ -0,0 +1,27 @@ + +Algebraic_foundations +Arithmetic_kernel +Cartesian_kernel +Circulator +Distance_2 +Distance_3 +Filtered_kernel +Hash_map +Homogeneous_kernel +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Kernel_d +Modular_arithmetic +Number_types +Periodic_3_triangulation_3 +Polygon +Profiling_tools +Property_map +STL_Extension +Spatial_sorting +Stream_support +TDS_3 +Triangulation_3 diff --git a/Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/test_periodic_3_regular_triangulation_3.cpp b/Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/test_periodic_3_regular_triangulation_3.cpp index b2637c1fda8..40278fe0e86 100644 --- a/Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/test_periodic_3_regular_triangulation_3.cpp +++ b/Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/test_periodic_3_regular_triangulation_3.cpp @@ -43,6 +43,7 @@ public: typedef typename P3RT3::Facet Facet; typedef typename P3RT3::Cell Cell; typedef typename P3RT3::Vertex_iterator Vertex_iterator; + typedef typename P3RT3::Unique_vertex_iterator Unique_vertex_iterator; typedef typename P3RT3::Cell_iterator Cell_iterator; typedef typename P3RT3::Segment Segment; typedef typename P3RT3::Triangle Triangle; @@ -78,6 +79,100 @@ public: assert(p3rt3.is_valid()); } + static void test_is_gabriel() + { + std::cout << "--- test is_gabriel" << std::endl; + + P3RT3 p3rt3; + + typename P3RT3::Geom_traits::Power_side_of_bounded_power_sphere_3 + side_of_bounded_power_sphere = + p3rt3.geom_traits().power_side_of_bounded_power_sphere_3_object(); + + Weighted_point_3 t(Point_3(0.5,0.5,0.45), 0.01); + Weighted_point_3 s(Point_3(0.5,0.5,0.49), 0.006); + Weighted_point_3 q(Point_3(0.5,0.5,0.5), 0.015); + Weighted_point_3 p(Point_3(0.95,0.95,0.96), 0.001); + Weighted_point_3 r(Point_3(0.01,0.008,0.01), 0.002); + p3rt3.insert(p); + p3rt3.insert(q); + p3rt3.insert(r); + p3rt3.insert(s); + p3rt3.insert(t); + + assert(p3rt3.is_valid()); + + std::cout << "p3rt3.number_of_vertices() " << p3rt3.number_of_vertices() << std::endl; + assert(p3rt3.number_of_vertices() == 4); + assert(std::distance(p3rt3.unique_vertices_begin(), p3rt3.unique_vertices_end()) == 4); + assert(p3rt3.number_of_stored_vertices() == 108); + + for(Unique_vertex_iterator iter = p3rt3.unique_vertices_begin(), end_iter = p3rt3.unique_vertices_end(); iter != end_iter; ++iter) + { + Vertex_handle vh((Vertex_iterator(iter))); + std::cout << p3rt3.is_Gabriel(vh) << std::endl; + if(p3rt3.is_Gabriel(vh)) + { + for(Unique_vertex_iterator iter2 = p3rt3.unique_vertices_begin(), end_iter2 = p3rt3.unique_vertices_end(); iter2 != end_iter2; ++iter2) + { + Vertex_handle vh2((Vertex_iterator(iter2))); + + if(vh2->point() == vh->point()) + { + assert(p3rt3.is_Gabriel(vh2)); // consistency check + } + else + { + // Check that w/e the offset, the power distance is positive + for(int i = -1; i < 2; ++i) { + for(int j = -1; j < 2; ++j) { + for(int k = -1; k < 2; ++k) + { + const Offset off(i, j, k); +// std::cout << "power distance: " << p3rt3.geom_traits().compute_power_product_3_object()( +// Weighted_point_3(vh->point().point(), vh->point().weight()), +// p3rt3.geom_traits().construct_weighted_point_3_object()(vh2->point(), off)) << std::endl; + if(!(side_of_bounded_power_sphere(vh->point(), vh2->point(), + Offset(), off) != CGAL::ON_BOUNDED_SIDE)) + { + assert(false); + } + } + } + } + } + } + } + else + { + bool found = false; + for(Vertex_iterator iter2 = p3rt3.vertices_begin(), end_iter2 = p3rt3.vertices_end(); iter2 != end_iter2; ++iter2) + { + Vertex_handle vh2 = iter2; + if(vh2->point() == vh->point()) + { + assert(!p3rt3.is_Gabriel(vh2)); // consistency check + } + else + { + for(int i = -1; i < 2; ++i) { + for(int j = -1; j < 2; ++j) { + for(int k = -1; k < 2; ++k) + { + const Offset off = vh->offset() + Offset(i, j, k); + if(!(side_of_bounded_power_sphere(vh->point(), vh2->point(), + vh->offset(), off) != CGAL::ON_BOUNDED_SIDE)) + found = true; + } + } + } + } + } // iter2 + assert(found); // must have found a point that is in the smallest orthogonal power sphere + } // is_gabriel(vh) + } + } + static void test_insert_1 () { std::cout << "--- test_insert_1" << std::endl; @@ -722,6 +817,7 @@ public: static void test () { + test_is_gabriel(); test_find_conflicts(); test_insert_range(800, 7); test_construction_and_insert_range(800, 7); @@ -737,7 +833,6 @@ public: test_insert_two_points_with_the_same_position(); test_remove(); test_27_to_1_sheeted_covering(); - ////// Iso_cuboid unitaire -> 0 <= weight < 0.015625 test_insert_rnd_as_delaunay(100, 0.); test_insert_rnd_as_delaunay(100, 0.01); } diff --git a/Point_set_2/package_info/Point_set_2/dependencies b/Point_set_2/package_info/Point_set_2/dependencies new file mode 100644 index 00000000000..944d0b6110b --- /dev/null +++ b/Point_set_2/package_info/Point_set_2/dependencies @@ -0,0 +1,20 @@ + +Algebraic_foundations +Circulator +Distance_2 +Filtered_kernel +Hash_map +Installation +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +Point_set_2 +Polygon +Profiling_tools +Property_map +STL_Extension +Spatial_sorting +Stream_support +TDS_2 +Triangulation_2 diff --git a/Point_set_3/include/CGAL/Point_set_3/IO.h b/Point_set_3/include/CGAL/Point_set_3/IO.h index 7b33dd85343..b4da7160293 100644 --- a/Point_set_3/include/CGAL/Point_set_3/IO.h +++ b/Point_set_3/include/CGAL/Point_set_3/IO.h @@ -24,6 +24,7 @@ #include +#include #include #include #include diff --git a/Point_set_3/package_info/Point_set_3/dependencies b/Point_set_3/package_info/Point_set_3/dependencies new file mode 100644 index 00000000000..c983f0972bd --- /dev/null +++ b/Point_set_3/package_info/Point_set_3/dependencies @@ -0,0 +1,16 @@ + +Algebraic_foundations +BGL +Installation +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +Point_set_3 +Point_set_processing_3 +Profiling_tools +Property_map +STL_Extension +Solver_interface +Stream_support +Surface_mesh 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 579d7334780..3f9ebfd728d 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 @@ -26,6 +26,8 @@ #include #include +#include +#include #include #include diff --git a/Point_set_processing_3/include/CGAL/structure_point_set.h b/Point_set_processing_3/include/CGAL/structure_point_set.h index 34fad87e79c..0cf8acd2d1a 100644 --- a/Point_set_processing_3/include/CGAL/structure_point_set.h +++ b/Point_set_processing_3/include/CGAL/structure_point_set.h @@ -36,6 +36,7 @@ #include #include #include +#include #include #include @@ -43,6 +44,8 @@ #include #include +#include + #include #include #include diff --git a/Point_set_processing_3/package_info/Point_set_processing_3/dependencies b/Point_set_processing_3/package_info/Point_set_processing_3/dependencies new file mode 100644 index 00000000000..95a10d692e2 --- /dev/null +++ b/Point_set_processing_3/package_info/Point_set_processing_3/dependencies @@ -0,0 +1,44 @@ + +Algebraic_foundations +Arithmetic_kernel +BGL +Cartesian_kernel +Circulator +Convex_hull_2 +Convex_hull_3 +Distance_2 +Distance_3 +Filtered_kernel +Generator +HalfedgeDS +Hash_map +Installation +Intersections_2 +Intersections_3 +Interval_support +Jet_fitting_3 +Kernel_23 +Kernel_d +Modifier +Modular_arithmetic +Number_types +Point_set_2 +Point_set_processing_3 +Polygon +Polyhedron +Polyhedron_IO +Principal_component_analysis +Principal_component_analysis_LGPL +Profiling_tools +Property_map +QP_solver +Random_numbers +STL_Extension +Solver_interface +Spatial_searching +Spatial_sorting +Stream_support +TDS_2 +TDS_3 +Triangulation_2 +Triangulation_3 diff --git a/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Region_growing.h b/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Region_growing.h index d01ce1d726c..2e0566b6bd1 100644 --- a/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Region_growing.h +++ b/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Region_growing.h @@ -36,6 +36,8 @@ #include #include +#include +#include namespace CGAL { namespace Shape_detection_3 { diff --git a/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/property_maps.h b/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/property_maps.h index b099dbd3578..8f787a03822 100644 --- a/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/property_maps.h +++ b/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/property_maps.h @@ -21,6 +21,8 @@ // #include +#include +#include #ifndef CGAL_SHAPE_DETECTION_3_PROPERTY_MAPS_H #define CGAL_SHAPE_DETECTION_3_PROPERTY_MAPS_H diff --git a/Point_set_shape_detection_3/package_info/Point_set_shape_detection_3/dependencies b/Point_set_shape_detection_3/package_info/Point_set_shape_detection_3/dependencies new file mode 100644 index 00000000000..557f7da226e --- /dev/null +++ b/Point_set_shape_detection_3/package_info/Point_set_shape_detection_3/dependencies @@ -0,0 +1,21 @@ + +Algebraic_foundations +Circulator +Distance_2 +Distance_3 +Installation +Interval_support +Kernel_23 +Kernel_d +Modular_arithmetic +Number_types +Point_set_shape_detection_3 +Principal_component_analysis +Principal_component_analysis_LGPL +Profiling_tools +Property_map +Random_numbers +STL_Extension +Solver_interface +Spatial_searching +Stream_support diff --git a/Poisson_surface_reconstruction_3/package_info/Poisson_surface_reconstruction_3/dependencies b/Poisson_surface_reconstruction_3/package_info/Poisson_surface_reconstruction_3/dependencies new file mode 100644 index 00000000000..8b2beafe466 --- /dev/null +++ b/Poisson_surface_reconstruction_3/package_info/Poisson_surface_reconstruction_3/dependencies @@ -0,0 +1,37 @@ + +Algebraic_foundations +Arithmetic_kernel +BGL +Cartesian_kernel +Circulator +Distance_2 +Distance_3 +Filtered_kernel +Generator +Hash_map +Homogeneous_kernel +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Kernel_d +Mesher_level +Modular_arithmetic +Number_types +Point_set_processing_3 +Poisson_surface_reconstruction_3 +Polygon +Principal_component_analysis_LGPL +Profiling_tools +Property_map +Random_numbers +STL_Extension +Solver_interface +Spatial_searching +Spatial_sorting +Stream_support +Surface_mesher +TDS_3 +Triangulation_3 +Union_find diff --git a/Polygon/package_info/Polygon/dependencies b/Polygon/package_info/Polygon/dependencies new file mode 100644 index 00000000000..95323c8e3fc --- /dev/null +++ b/Polygon/package_info/Polygon/dependencies @@ -0,0 +1,10 @@ + +Algebraic_foundations +Circulator +Installation +Kernel_23 +Number_types +Polygon +Profiling_tools +STL_Extension +Stream_support diff --git a/Polygon_mesh_processing/package_info/Polygon_mesh_processing/dependencies b/Polygon_mesh_processing/package_info/Polygon_mesh_processing/dependencies new file mode 100644 index 00000000000..588cc6a490a --- /dev/null +++ b/Polygon_mesh_processing/package_info/Polygon_mesh_processing/dependencies @@ -0,0 +1,38 @@ + +AABB_tree +Algebraic_foundations +Arithmetic_kernel +BGL +Box_intersection_d +Cartesian_kernel +Circulator +Distance_2 +Distance_3 +Filtered_kernel +Generator +Hash_map +Homogeneous_kernel +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Kernel_d +Mesh_3 +Modular_arithmetic +Number_types +Polygon +Polygon_mesh_processing +Profiling_tools +Property_map +Random_numbers +STL_Extension +Solver_interface +Spatial_searching +Spatial_sorting +Stream_support +TDS_2 +TDS_3 +Triangulation_2 +Triangulation_3 +Union_find diff --git a/Polyhedron/demo/Polyhedron/MainWindow.cpp b/Polyhedron/demo/Polyhedron/MainWindow.cpp index 54cfde41e68..169c66b5e95 100644 --- a/Polyhedron/demo/Polyhedron/MainWindow.cpp +++ b/Polyhedron/demo/Polyhedron/MainWindow.cpp @@ -1015,7 +1015,7 @@ void MainWindow::open(QString filename) Q_FOREACH(CGAL::Three::Polyhedron_demo_io_plugin_interface* io_plugin, io_plugins) { if ( !io_plugin->canLoad() ) continue; all_items << io_plugin->name(); - if ( file_matches_filter(io_plugin->loadNameFilters(), filename) ) + if ( file_matches_filter(io_plugin->loadNameFilters(), filename.toLower()) ) selected_items << io_plugin->name(); } } @@ -1588,6 +1588,14 @@ void MainWindow::on_actionSaveAs_triggered() QString ext1, ext2; QRegExp extensions("\\(\\*\\..+\\)"); QStringList filter_ext; + if(filters.empty()) + { + QMessageBox::warning(this, + tr("Cannot save"), + tr("The selected object %1 cannot be saved.") + .arg(item->name())); + return; + } Q_FOREACH(QString s, filters.first().split(";;")) { int pos = extensions.indexIn(s); @@ -1642,7 +1650,7 @@ void MainWindow::save(QString filename, CGAL::Three::Scene_item* item) { bool saved = false; Q_FOREACH(CGAL::Three::Polyhedron_demo_io_plugin_interface* plugin, io_plugins) { if( plugin->canSave(item) && - file_matches_filter(plugin->saveNameFilters(),filename) ) + file_matches_filter(plugin->saveNameFilters(),filename.toLower()) ) { if(plugin->save(item, fileinfo)) { diff --git a/Polyhedron/demo/Polyhedron/Plugins/Classification/CMakeLists.txt b/Polyhedron/demo/Polyhedron/Plugins/Classification/CMakeLists.txt index a57a1f32a11..a3fb2021c88 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Classification/CMakeLists.txt +++ b/Polyhedron/demo/Polyhedron/Plugins/Classification/CMakeLists.txt @@ -8,6 +8,9 @@ if(EIGEN3_FOUND) find_package(Boost OPTIONAL_COMPONENTS serialization iostreams) if( WIN32 ) +# to avoid a warning with old cmake + set(_Boost_BZIP2_HEADERS "boost/iostreams/filter/bzip2.hpp") + set(_Boost_ZLIB_HEADERS "boost/iostreams/filter/zlib.hpp") find_package( Boost OPTIONAL_COMPONENTS zlib) if( Boost_ZLIB_FOUND ) set(classification_linked_libraries ${classification_linked_libraries} diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Surface_reconstruction_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Point_set/Surface_reconstruction_plugin.cpp index 373c8b4110b..63003bb8cdb 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Surface_reconstruction_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Point_set/Surface_reconstruction_plugin.cpp @@ -1281,7 +1281,8 @@ void Polyhedron_demo_surface_reconstruction_plugin::scale_space_reconstruction dialog.neighborhood_size (), dialog.samples(), dialog.scalespace_af(), dialog.generate_smoothed (), - dialog.longest_edge_2(), dialog.radius_ratio_bound_2(), dialog.beta_angle_2(), + dialog.longest_edge_2(), dialog.radius_ratio_bound_2(), + CGAL_PI * dialog.beta_angle_2 () / 180., dialog.separate_shells (), dialog.force_manifold ()); for (std::size_t i = 0; i < reco_items.size (); ++ i) diff --git a/Polyhedron/demo/Polyhedron/Scene.cpp b/Polyhedron/demo/Polyhedron/Scene.cpp index 1b1b7970b7b..27fb9ab3835 100644 --- a/Polyhedron/demo/Polyhedron/Scene.cpp +++ b/Polyhedron/demo/Polyhedron/Scene.cpp @@ -790,7 +790,7 @@ Scene::setData(const QModelIndex &index, return true; break; case ColorColumn: - if(!selectionIndices().empty()) + if(selectionIndices().contains(item_id(item))) Q_FOREACH(Item_id item_index, selectionIndices()) this->item(item_index)->setColor(value.value()); else diff --git a/Polyhedron/include/CGAL/Polyhedron_3_to_lcc.h b/Polyhedron/include/CGAL/Polyhedron_3_to_lcc.h index 779ceb05814..80e2d53929c 100644 --- a/Polyhedron/include/CGAL/Polyhedron_3_to_lcc.h +++ b/Polyhedron/include/CGAL/Polyhedron_3_to_lcc.h @@ -25,6 +25,7 @@ #include #include #include +#include namespace CGAL { diff --git a/Polyhedron/package_info/Polyhedron/dependencies b/Polyhedron/package_info/Polyhedron/dependencies new file mode 100644 index 00000000000..36c5582710f --- /dev/null +++ b/Polyhedron/package_info/Polyhedron/dependencies @@ -0,0 +1,19 @@ + +Algebraic_foundations +BGL +Circulator +Distance_2 +HalfedgeDS +Hash_map +Installation +Interval_support +Kernel_23 +Modifier +Modular_arithmetic +Number_types +Polyhedron +Polyhedron_IO +Profiling_tools +Property_map +STL_Extension +Stream_support diff --git a/Polyhedron_IO/package_info/Polyhedron_IO/dependencies b/Polyhedron_IO/package_info/Polyhedron_IO/dependencies new file mode 100644 index 00000000000..ddff663b75c --- /dev/null +++ b/Polyhedron_IO/package_info/Polyhedron_IO/dependencies @@ -0,0 +1,21 @@ + +Algebraic_foundations +BGL +Circulator +Distance_2 +Geomview +HalfedgeDS +Hash_map +Installation +Interval_support +Inventor +Kernel_23 +Modifier +Modular_arithmetic +Number_types +Polyhedron +Polyhedron_IO +Profiling_tools +Property_map +STL_Extension +Stream_support diff --git a/Polyline_simplification_2/package_info/Polyline_simplification_2/dependencies b/Polyline_simplification_2/package_info/Polyline_simplification_2/dependencies new file mode 100644 index 00000000000..23dae1e27c4 --- /dev/null +++ b/Polyline_simplification_2/package_info/Polyline_simplification_2/dependencies @@ -0,0 +1,27 @@ + +Algebraic_foundations +Arithmetic_kernel +Cartesian_kernel +Circulator +Distance_2 +Distance_3 +Filtered_kernel +Hash_map +Homogeneous_kernel +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Kernel_d +Modular_arithmetic +Number_types +Polygon +Polyline_simplification_2 +Profiling_tools +Property_map +STL_Extension +Spatial_sorting +Stream_support +TDS_2 +Triangulation_2 diff --git a/Polynomial/package_info/Polynomial/dependencies b/Polynomial/package_info/Polynomial/dependencies new file mode 100644 index 00000000000..854f616ab4a --- /dev/null +++ b/Polynomial/package_info/Polynomial/dependencies @@ -0,0 +1,13 @@ + +Algebraic_foundations +Arithmetic_kernel +Circulator +Installation +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +Polynomial +Profiling_tools +STL_Extension +Stream_support diff --git a/Polytope_distance_d/package_info/Polytope_distance_d/dependencies b/Polytope_distance_d/package_info/Polytope_distance_d/dependencies new file mode 100644 index 00000000000..5b1a4b623c2 --- /dev/null +++ b/Polytope_distance_d/package_info/Polytope_distance_d/dependencies @@ -0,0 +1,36 @@ + +Algebraic_foundations +Arithmetic_kernel +BGL +Cartesian_kernel +Circulator +Convex_hull_2 +Convex_hull_3 +Distance_2 +Distance_3 +Filtered_kernel +HalfedgeDS +Hash_map +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Kernel_d +Matrix_search +Modifier +Modular_arithmetic +Number_types +Optimisation_basic +Polygon +Polyhedron +Polyhedron_IO +Polytope_distance_d +Profiling_tools +Property_map +QP_solver +Random_numbers +STL_Extension +Stream_support +TDS_2 +Triangulation_2 diff --git a/Principal_component_analysis/package_info/Principal_component_analysis/dependencies b/Principal_component_analysis/package_info/Principal_component_analysis/dependencies new file mode 100644 index 00000000000..dd1c5cea708 --- /dev/null +++ b/Principal_component_analysis/package_info/Principal_component_analysis/dependencies @@ -0,0 +1,14 @@ + +Algebraic_foundations +Installation +Interval_support +Kernel_23 +Kernel_d +Modular_arithmetic +Number_types +Principal_component_analysis +Principal_component_analysis_LGPL +Profiling_tools +STL_Extension +Solver_interface +Stream_support diff --git a/Principal_component_analysis_LGPL/package_info/Principal_component_analysis_LGPL/dependencies b/Principal_component_analysis_LGPL/package_info/Principal_component_analysis_LGPL/dependencies new file mode 100644 index 00000000000..e323621c3b0 --- /dev/null +++ b/Principal_component_analysis_LGPL/package_info/Principal_component_analysis_LGPL/dependencies @@ -0,0 +1,10 @@ + +Algebraic_foundations +Installation +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +Profiling_tools +STL_Extension +Stream_support diff --git a/Profiling_tools/package_info/Profiling_tools/dependencies b/Profiling_tools/package_info/Profiling_tools/dependencies new file mode 100644 index 00000000000..d7584762e2e --- /dev/null +++ b/Profiling_tools/package_info/Profiling_tools/dependencies @@ -0,0 +1,5 @@ + +Installation +Kernel_23 +Profiling_tools +STL_Extension diff --git a/Property_map/include/CGAL/Dynamic_property_map.h b/Property_map/include/CGAL/Dynamic_property_map.h index 03ae5b16006..514ae5d4593 100644 --- a/Property_map/include/CGAL/Dynamic_property_map.h +++ b/Property_map/include/CGAL/Dynamic_property_map.h @@ -203,7 +203,7 @@ namespace CGAL { template typename boost::property_map >::const_type -get(CGAL::dynamic_vertex_property_t prop, const G&) +get(const CGAL::dynamic_vertex_property_t&, const G&) { typedef typename boost::graph_traits::vertex_descriptor vertex_descriptor; return internal::Dynamic_property_map(); @@ -211,7 +211,7 @@ get(CGAL::dynamic_vertex_property_t prop, const G&) template typename boost::property_map >::const_type -get(CGAL::dynamic_halfedge_property_t prop, const G&) +get(const CGAL::dynamic_halfedge_property_t&, const G&) { typedef typename boost::graph_traits::halfedge_descriptor halfedge_descriptor; return internal::Dynamic_property_map(); @@ -219,7 +219,7 @@ get(CGAL::dynamic_halfedge_property_t prop, const G&) template typename boost::property_map >::const_type -get(CGAL::dynamic_edge_property_t prop, const G&) +get(const CGAL::dynamic_edge_property_t&, const G&) { typedef typename boost::graph_traits::edge_descriptor edge_descriptor; return internal::Dynamic_property_map(); @@ -227,7 +227,7 @@ get(CGAL::dynamic_edge_property_t prop, const G&) template typename boost::property_map >::const_type -get(CGAL::dynamic_face_property_t prop, const G&) +get(const CGAL::dynamic_face_property_t&, const G&) { typedef typename boost::graph_traits::face_descriptor face_descriptor; return internal::Dynamic_property_map(); diff --git a/Property_map/package_info/Property_map/dependencies b/Property_map/package_info/Property_map/dependencies new file mode 100644 index 00000000000..aef3b5a3343 --- /dev/null +++ b/Property_map/package_info/Property_map/dependencies @@ -0,0 +1,3 @@ + +Installation +STL_Extension diff --git a/QP_solver/package_info/QP_solver/dependencies b/QP_solver/package_info/QP_solver/dependencies new file mode 100644 index 00000000000..40060c69980 --- /dev/null +++ b/QP_solver/package_info/QP_solver/dependencies @@ -0,0 +1,13 @@ + +Algebraic_foundations +Circulator +Installation +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +Profiling_tools +QP_solver +Random_numbers +STL_Extension +Stream_support diff --git a/Random_numbers/package_info/Random_numbers/dependencies b/Random_numbers/package_info/Random_numbers/dependencies new file mode 100644 index 00000000000..e323621c3b0 --- /dev/null +++ b/Random_numbers/package_info/Random_numbers/dependencies @@ -0,0 +1,10 @@ + +Algebraic_foundations +Installation +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +Profiling_tools +STL_Extension +Stream_support diff --git a/Ridges_3/package_info/Ridges_3/dependencies b/Ridges_3/package_info/Ridges_3/dependencies new file mode 100644 index 00000000000..6d2483ae665 --- /dev/null +++ b/Ridges_3/package_info/Ridges_3/dependencies @@ -0,0 +1,17 @@ + +Algebraic_foundations +BGL +Bounding_volumes +Circulator +Installation +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +Optimisation_basic +Principal_component_analysis_LGPL +Profiling_tools +Property_map +Ridges_3 +STL_Extension +Stream_support diff --git a/STL_Extension/include/CGAL/assertions.h b/STL_Extension/include/CGAL/assertions.h index 892cc39951e..00588419f00 100644 --- a/STL_Extension/include/CGAL/assertions.h +++ b/STL_Extension/include/CGAL/assertions.h @@ -100,9 +100,14 @@ inline bool possibly(Uncertain c); #else // no CGAL_NO_ASSERTIONS # define CGAL_assertion(EX) \ (CGAL::possibly(EX)?(static_cast(0)): ::CGAL::assertion_fail( # EX , __FILE__, __LINE__)) -# define CGAL_destructor_assertion(EX) \ - (CGAL::possibly(EX)||std::uncaught_exception()?(static_cast(0)): ::CGAL::assertion_fail( # EX , __FILE__, __LINE__)) -# define CGAL_assertion_msg(EX,MSG) \ +# if __cpp_lib_uncaught_exceptions // C++17 +# define CGAL_destructor_assertion(EX) \ + (CGAL::possibly(EX)||(std::uncaught_exceptions() > 0)?(static_cast(0)): ::CGAL::assertion_fail( # EX , __FILE__, __LINE__)) +# else // use C++03 `std::uncaught_exception()` +# define CGAL_destructor_assertion(EX) \ + (CGAL::possibly(EX)||std::uncaught_exception()?(static_cast(0)): ::CGAL::assertion_fail( # EX , __FILE__, __LINE__)) +# endif // use C++03 `std::uncaught_exception()` +# define CGAL_assertion_msg(EX,MSG) \ (CGAL::possibly(EX)?(static_cast(0)): ::CGAL::assertion_fail( # EX , __FILE__, __LINE__, MSG)) # define CGAL_assertion_code(CODE) CODE # define CGAL_assume(EX) CGAL_assertion(EX) diff --git a/STL_Extension/package_info/STL_Extension/dependencies b/STL_Extension/package_info/STL_Extension/dependencies new file mode 100644 index 00000000000..1460e34fbb0 --- /dev/null +++ b/STL_Extension/package_info/STL_Extension/dependencies @@ -0,0 +1,11 @@ + +Algebraic_foundations +Circulator +Installation +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +Profiling_tools +STL_Extension +Stream_support diff --git a/Scale_space_reconstruction_3/package_info/Scale_space_reconstruction_3/dependencies b/Scale_space_reconstruction_3/package_info/Scale_space_reconstruction_3/dependencies new file mode 100644 index 00000000000..3bc0e994b3b --- /dev/null +++ b/Scale_space_reconstruction_3/package_info/Scale_space_reconstruction_3/dependencies @@ -0,0 +1,43 @@ + +Advancing_front_surface_reconstruction +Algebraic_foundations +Alpha_shapes_3 +Arithmetic_kernel +BGL +Cartesian_kernel +Circulator +Distance_2 +Distance_3 +Filtered_kernel +Geomview +HalfedgeDS +Hash_map +Homogeneous_kernel +Installation +Intersections_2 +Intersections_3 +Interval_support +Jet_fitting_3 +Kernel_23 +Kernel_d +Modifier +Modular_arithmetic +Number_types +Point_set_processing_3 +Polygon +Polyhedron +Polyhedron_IO +Profiling_tools +Property_map +Random_numbers +STL_Extension +Scale_space_reconstruction_3 +Solver_interface +Spatial_searching +Spatial_sorting +Stream_support +TDS_2 +TDS_3 +Triangulation_2 +Triangulation_3 +Union_find diff --git a/Scripts/developer_scripts/cgal_check_dependencies.sh b/Scripts/developer_scripts/cgal_check_dependencies.sh new file mode 100644 index 00000000000..2bb62a19a21 --- /dev/null +++ b/Scripts/developer_scripts/cgal_check_dependencies.sh @@ -0,0 +1,59 @@ +#This script must be called from the CGAL root. +set -e +set -x +while test $# -gt 0 +do + case "$1" in + --help) echo "Usage: $0 " + echo " $0 must be called from the CGAL root directory. It will compile documentation for all packages using doxygen_exe_path, and deduce " + echo "their dependencies. It will then compare them with the previous ones and output 1if the dependencies has changed, " + echo "0 otherwise." + exit 0 + ;; + --*) echo "bad option $1" + ;; + *) DOX_PATH="$1" + ;; + esac + shift +done + +CGAL_ROOT=$PWD +mkdir -p dep_check_build && cd dep_check_build +for pkg_path in $CGAL_ROOT/* +do + pkg=$(basename $pkg_path) + if [ -f $pkg_path/package_info/$pkg/dependencies ]; then + mv $pkg_path/package_info/$pkg/dependencies $pkg_path/package_info/$pkg/dependencies.old + fi +done + +cmake -DCGAL_ENABLE_CHECK_HEADERS=TRUE -DDOXYGEN_EXECUTABLE="$DOX_PATH" -DCGAL_COPY_DEPENDENCIES=TRUE -DCMAKE_CXX_FLAGS="-std=c++11" .. +make -j$(nproc --all) packages_dependencies +echo " Checks finished" +for pkg_path in $CGAL_ROOT/* +do + pkg=$(basename $pkg_path) + if [ -f "$pkg_path/package_info/$pkg/dependencies" ]; then + PKG_DIFF=$(diff -N -w "$pkg_path/package_info/$pkg/dependencies.old" "$pkg_path/package_info/$pkg/dependencies") + if [ -n "$PKG_DIFF" ]; then + HAS_DIFF=TRUE + echo "Differences in $pkg: $PKG_DIFF" + else + echo "No differencies in $pkg dependencies." + fi + if [ -f $pkg_path/package_info/$pkg/dependencies.old ]; then + rm $pkg_path/package_info/$pkg/dependencies.old + fi + fi +done +echo " Checks finished" +cd $CGAL_ROOT +rm -r dep_check_build +if [ -n "$HAS_DIFF" ]; then + echo " You should run cmake with options CGAL_CHECK_HEADERS and CGAL_COPY_DEPENDENCIES ON, make the target packages_dependencies and commit the new dependencies files." + exit 1 +else + echo "The dependencies are up to date." + exit 0 +fi diff --git a/Scripts/developer_scripts/generate_list_of_documented_headers b/Scripts/developer_scripts/generate_list_of_documented_headers deleted file mode 100755 index 167fb221e09..00000000000 --- a/Scripts/developer_scripts/generate_list_of_documented_headers +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -# Used to regenerate `Installation/list_of_documented_headers.cmake` -# -# Run it in the `Installation` directory of a Git layout, with -# `../build-doc/doc_output/` containing the build of the Doxygen -# documentation. - -file=cmake/modules/list_of_documented_headers.cmake - -printf "# Generated using $0\n" > "$file" - -exec >> "$file" - -printf 'set(list_of_documented_headers_txt [=[\n' -ack --no-heading --no-filename --output='$2' '# *include *(<|[<"])(CGAL/[^>&]*)([>"]|>)' ../build-doc/doc_output/*/*.html ../*/examples/*/*.cpp | sort | uniq -printf ']=])\n' -printf 'separate_arguments(list_of_documented_headers UNIX_COMMAND ${list_of_documented_headers_txt})\n' diff --git a/Scripts/developer_scripts/run_doxygen_testsuite b/Scripts/developer_scripts/run_doxygen_testsuite index 76a218c2b67..f5cd10a1f12 100755 --- a/Scripts/developer_scripts/run_doxygen_testsuite +++ b/Scripts/developer_scripts/run_doxygen_testsuite @@ -65,7 +65,7 @@ export PATH cd "$PWD/doc/scripts" bash -$- ./process_doc.sh /home/cgal-testsuite/local/bin/doxygen /home/mgimeno/bin/doxygen /srv/CGAL/www/Members/Manual_doxygen_test if head -2 ../../.scm-branch | grep -q cgal/master; then - rsync -a --delete "/srv/CGAL/www/Members/Manual_doxygen_test/${CGAL_RELEASE_ID}/output1/" /srv/CGAL/www/doc/master/ + rsync -a --delete "/srv/CGAL/www/Members/Manual_doxygen_test/${CGAL_RELEASE_ID}/output2/" /srv/CGAL/www/doc/master/ fi rm -rf "${CGAL_DOC_BUILD}" # Then gzip the log file, to save space diff --git a/SearchStructures/package_info/SearchStructures/dependencies b/SearchStructures/package_info/SearchStructures/dependencies new file mode 100644 index 00000000000..8a7eebeb1da --- /dev/null +++ b/SearchStructures/package_info/SearchStructures/dependencies @@ -0,0 +1,8 @@ + +Algebraic_foundations +Installation +Kernel_23 +Profiling_tools +STL_Extension +SearchStructures +Stream_support diff --git a/Segment_Delaunay_graph_2/package_info/Segment_Delaunay_graph_2/dependencies b/Segment_Delaunay_graph_2/package_info/Segment_Delaunay_graph_2/dependencies new file mode 100644 index 00000000000..3d1854ae247 --- /dev/null +++ b/Segment_Delaunay_graph_2/package_info/Segment_Delaunay_graph_2/dependencies @@ -0,0 +1,28 @@ + +Algebraic_foundations +Apollonius_graph_2 +Arithmetic_kernel +Cartesian_kernel +Circulator +Distance_2 +Distance_3 +Filtered_kernel +Hash_map +Homogeneous_kernel +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Kernel_d +Modular_arithmetic +Number_types +Polygon +Profiling_tools +Property_map +STL_Extension +Segment_Delaunay_graph_2 +Spatial_sorting +Stream_support +TDS_2 +Triangulation_2 diff --git a/Segment_Delaunay_graph_Linf_2/package_info/Segment_Delaunay_graph_Linf_2/dependencies b/Segment_Delaunay_graph_Linf_2/package_info/Segment_Delaunay_graph_Linf_2/dependencies new file mode 100644 index 00000000000..65d503d6a5d --- /dev/null +++ b/Segment_Delaunay_graph_Linf_2/package_info/Segment_Delaunay_graph_Linf_2/dependencies @@ -0,0 +1,29 @@ + +Algebraic_foundations +Apollonius_graph_2 +Arithmetic_kernel +Cartesian_kernel +Circulator +Distance_2 +Distance_3 +Filtered_kernel +Hash_map +Homogeneous_kernel +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Kernel_d +Modular_arithmetic +Number_types +Polygon +Profiling_tools +Property_map +STL_Extension +Segment_Delaunay_graph_2 +Segment_Delaunay_graph_Linf_2 +Spatial_sorting +Stream_support +TDS_2 +Triangulation_2 diff --git a/Set_movable_separability_2/package_info/Set_movable_separability_2/dependencies b/Set_movable_separability_2/package_info/Set_movable_separability_2/dependencies new file mode 100644 index 00000000000..2412f005abe --- /dev/null +++ b/Set_movable_separability_2/package_info/Set_movable_separability_2/dependencies @@ -0,0 +1,11 @@ + +Algebraic_foundations +Circulator +Installation +Kernel_23 +Number_types +Polygon +Profiling_tools +STL_Extension +Set_movable_separability_2 +Stream_support diff --git a/Skin_surface_3/package_info/Skin_surface_3/dependencies b/Skin_surface_3/package_info/Skin_surface_3/dependencies new file mode 100644 index 00000000000..c4805a30400 --- /dev/null +++ b/Skin_surface_3/package_info/Skin_surface_3/dependencies @@ -0,0 +1,33 @@ + +Algebraic_foundations +Arithmetic_kernel +BGL +Cartesian_kernel +Circulator +Distance_2 +Distance_3 +Filtered_kernel +HalfedgeDS +Hash_map +Homogeneous_kernel +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Kernel_d +Modifier +Modular_arithmetic +Number_types +Polygon +Polyhedron +Polyhedron_IO +Profiling_tools +Property_map +STL_Extension +Skin_surface_3 +Spatial_sorting +Stream_support +TDS_3 +Triangulation_3 +Union_find diff --git a/Snap_rounding_2/package_info/Snap_rounding_2/dependencies b/Snap_rounding_2/package_info/Snap_rounding_2/dependencies new file mode 100644 index 00000000000..2c1f5d3c421 --- /dev/null +++ b/Snap_rounding_2/package_info/Snap_rounding_2/dependencies @@ -0,0 +1,25 @@ + +Algebraic_foundations +Arithmetic_kernel +Arrangement_on_surface_2 +Cartesian_kernel +Circulator +Distance_2 +Distance_3 +Filtered_kernel +Homogeneous_kernel +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Kernel_d +Modular_arithmetic +Number_types +Profiling_tools +Property_map +STL_Extension +Snap_rounding_2 +Spatial_searching +Stream_support +Surface_sweep_2 diff --git a/Solver_interface/package_info/Solver_interface/dependencies b/Solver_interface/package_info/Solver_interface/dependencies new file mode 100644 index 00000000000..3406f23d65a --- /dev/null +++ b/Solver_interface/package_info/Solver_interface/dependencies @@ -0,0 +1,11 @@ + +Algebraic_foundations +Installation +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +Profiling_tools +STL_Extension +Solver_interface +Stream_support diff --git a/Spatial_searching/package_info/Spatial_searching/dependencies b/Spatial_searching/package_info/Spatial_searching/dependencies new file mode 100644 index 00000000000..890436c8220 --- /dev/null +++ b/Spatial_searching/package_info/Spatial_searching/dependencies @@ -0,0 +1,13 @@ + +Algebraic_foundations +Circulator +Installation +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +Profiling_tools +Property_map +STL_Extension +Spatial_searching +Stream_support diff --git a/Spatial_sorting/package_info/Spatial_sorting/dependencies b/Spatial_sorting/package_info/Spatial_sorting/dependencies new file mode 100644 index 00000000000..b471716b816 --- /dev/null +++ b/Spatial_sorting/package_info/Spatial_sorting/dependencies @@ -0,0 +1,11 @@ + +Algebraic_foundations +Installation +Kernel_23 +Number_types +Polygon +Profiling_tools +Property_map +STL_Extension +Spatial_sorting +Stream_support diff --git a/Straight_skeleton_2/package_info/Straight_skeleton_2/dependencies b/Straight_skeleton_2/package_info/Straight_skeleton_2/dependencies new file mode 100644 index 00000000000..d24c37c7b36 --- /dev/null +++ b/Straight_skeleton_2/package_info/Straight_skeleton_2/dependencies @@ -0,0 +1,25 @@ + +Algebraic_foundations +Arithmetic_kernel +CGAL_Core +Cartesian_kernel +Circulator +Distance_2 +Distance_3 +Filtered_kernel +HalfedgeDS +Hash_map +Homogeneous_kernel +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Kernel_d +Modular_arithmetic +Number_types +Polygon +Profiling_tools +STL_Extension +Straight_skeleton_2 +Stream_support diff --git a/Stream_lines_2/package_info/Stream_lines_2/dependencies b/Stream_lines_2/package_info/Stream_lines_2/dependencies new file mode 100644 index 00000000000..57ac9c67935 --- /dev/null +++ b/Stream_lines_2/package_info/Stream_lines_2/dependencies @@ -0,0 +1,20 @@ + +Algebraic_foundations +Circulator +Distance_2 +Filtered_kernel +Hash_map +Installation +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +Polygon +Profiling_tools +Property_map +STL_Extension +Spatial_sorting +Stream_lines_2 +Stream_support +TDS_2 +Triangulation_2 diff --git a/Stream_support/package_info/Stream_support/dependencies b/Stream_support/package_info/Stream_support/dependencies new file mode 100644 index 00000000000..fd99503b15c --- /dev/null +++ b/Stream_support/package_info/Stream_support/dependencies @@ -0,0 +1,8 @@ + +Algebraic_foundations +Circulator +Installation +Kernel_23 +Profiling_tools +STL_Extension +Stream_support diff --git a/Subdivision_method_3/include/CGAL/Subdivision_method_3/subdivision_masks_3.h b/Subdivision_method_3/include/CGAL/Subdivision_method_3/subdivision_masks_3.h index da9ad657d87..e6353e38b61 100644 --- a/Subdivision_method_3/include/CGAL/Subdivision_method_3/subdivision_masks_3.h +++ b/Subdivision_method_3/include/CGAL/Subdivision_method_3/subdivision_masks_3.h @@ -30,6 +30,7 @@ #include #include +#include namespace CGAL { diff --git a/Subdivision_method_3/package_info/Subdivision_method_3/dependencies b/Subdivision_method_3/package_info/Subdivision_method_3/dependencies new file mode 100644 index 00000000000..a9585a3fba1 --- /dev/null +++ b/Subdivision_method_3/package_info/Subdivision_method_3/dependencies @@ -0,0 +1,17 @@ + +Algebraic_foundations +BGL +Cartesian_kernel +Circulator +Installation +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +Polygon_mesh_processing +Profiling_tools +Property_map +STL_Extension +Solver_interface +Stream_support +Subdivision_method_3 diff --git a/Surface_mesh/package_info/Surface_mesh/dependencies b/Surface_mesh/package_info/Surface_mesh/dependencies new file mode 100644 index 00000000000..6e2d46b3801 --- /dev/null +++ b/Surface_mesh/package_info/Surface_mesh/dependencies @@ -0,0 +1,18 @@ + +Algebraic_foundations +BGL +Cartesian_kernel +Circulator +Distance_2 +Distance_3 +Hash_map +Installation +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +Profiling_tools +Property_map +STL_Extension +Stream_support +Surface_mesh diff --git a/Surface_mesh_deformation/package_info/Surface_mesh_deformation/dependencies b/Surface_mesh_deformation/package_info/Surface_mesh_deformation/dependencies new file mode 100644 index 00000000000..9b016839ff8 --- /dev/null +++ b/Surface_mesh_deformation/package_info/Surface_mesh_deformation/dependencies @@ -0,0 +1,21 @@ + +Algebraic_foundations +BGL +Cartesian_kernel +Circulator +Distance_2 +Distance_3 +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +Polygon_mesh_processing +Profiling_tools +Property_map +STL_Extension +Solver_interface +Stream_support +Surface_mesh_deformation diff --git a/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/orbifold.cpp b/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/orbifold.cpp index b9da99fc9e1..1a7f2ff7676 100644 --- a/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/orbifold.cpp +++ b/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/orbifold.cpp @@ -3,8 +3,6 @@ #include #include -#include -#include #include #include diff --git a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Two_vertices_parameterizer_3.h b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Two_vertices_parameterizer_3.h index 15f1b978b27..c94cad60938 100644 --- a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Two_vertices_parameterizer_3.h +++ b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Two_vertices_parameterizer_3.h @@ -27,7 +27,9 @@ #include #include +#include #include +#include #include #include diff --git a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/internal/Containers_filler.h b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/internal/Containers_filler.h index 2f715b8b3ad..a6be5b12e74 100644 --- a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/internal/Containers_filler.h +++ b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/internal/Containers_filler.h @@ -26,7 +26,7 @@ #include #include "boost/tuple/tuple.hpp" #include - +#include #include namespace CGAL { diff --git a/Surface_mesh_parameterization/package_info/Surface_mesh_parameterization/dependencies b/Surface_mesh_parameterization/package_info/Surface_mesh_parameterization/dependencies new file mode 100644 index 00000000000..3dd744aefb9 --- /dev/null +++ b/Surface_mesh_parameterization/package_info/Surface_mesh_parameterization/dependencies @@ -0,0 +1,27 @@ + +Algebraic_foundations +BGL +Box_intersection_d +Circulator +Distance_2 +Filtered_kernel +Hash_map +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +OpenNL +Polygon +Polygon_mesh_processing +Profiling_tools +Property_map +STL_Extension +Solver_interface +Spatial_sorting +Stream_support +Surface_mesh_parameterization +TDS_2 +Triangulation_2 diff --git a/Surface_mesh_segmentation/package_info/Surface_mesh_segmentation/dependencies b/Surface_mesh_segmentation/package_info/Surface_mesh_segmentation/dependencies new file mode 100644 index 00000000000..b091c1dce40 --- /dev/null +++ b/Surface_mesh_segmentation/package_info/Surface_mesh_segmentation/dependencies @@ -0,0 +1,22 @@ + +AABB_tree +Algebraic_foundations +BGL +Cartesian_kernel +Circulator +Distance_2 +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +Point_set_processing_3 +Profiling_tools +Property_map +Random_numbers +STL_Extension +Spatial_searching +Stream_support +Surface_mesh_segmentation diff --git a/Surface_mesh_shortest_path/package_info/Surface_mesh_shortest_path/dependencies b/Surface_mesh_shortest_path/package_info/Surface_mesh_shortest_path/dependencies new file mode 100644 index 00000000000..fc254cfb880 --- /dev/null +++ b/Surface_mesh_shortest_path/package_info/Surface_mesh_shortest_path/dependencies @@ -0,0 +1,20 @@ + +AABB_tree +Algebraic_foundations +BGL +Cartesian_kernel +Circulator +Distance_2 +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +Profiling_tools +Property_map +STL_Extension +Spatial_searching +Stream_support +Surface_mesh_shortest_path diff --git a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Bounded_normal_change_placement.h b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Bounded_normal_change_placement.h index fad6778c1fc..8682fbd7953 100644 --- a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Bounded_normal_change_placement.h +++ b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Bounded_normal_change_placement.h @@ -21,7 +21,7 @@ #define CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_EDGE_COLLAPSE_BOUNDED_NORMAL_CHANGE_PLACEMENT_H #include - +#include namespace CGAL { @@ -42,10 +42,10 @@ public: {} template - optional + boost::optional operator()( Profile const& aProfile) const { - optional op = mPlacement(aProfile); + boost::optional op = mPlacement(aProfile); if(op){ // triangles returns the triangles of the star of the vertices of the edge to collapse // First the two trianges incident to the edge, then the other triangles @@ -78,7 +78,7 @@ public: Vector n1 = Traits().construct_cross_product_vector_3_object()(eqp,eqr); Vector n2 = Traits().construct_cross_product_vector_3_object()(eq2p,eq2r); if(! is_positive(Traits().compute_scalar_product_3_object()(n1, n2))){ - return optional(); + return boost::optional(); } ++it; } diff --git a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Edge_length_stop_predicate.h b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Edge_length_stop_predicate.h index 50ffe9ae18d..511fe9f40d1 100644 --- a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Edge_length_stop_predicate.h +++ b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Edge_length_stop_predicate.h @@ -21,7 +21,7 @@ #define CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_EDGE_COLLAPSE_EDGE_LENGTH_STOP_PREDICATE_H 1 #include - +#include namespace CGAL { diff --git a/Surface_mesh_simplification/package_info/Surface_mesh_simplification/dependencies b/Surface_mesh_simplification/package_info/Surface_mesh_simplification/dependencies new file mode 100644 index 00000000000..81140ca1980 --- /dev/null +++ b/Surface_mesh_simplification/package_info/Surface_mesh_simplification/dependencies @@ -0,0 +1,17 @@ + +Algebraic_foundations +BGL +Cartesian_kernel +Circulator +Distance_2 +Distance_3 +Installation +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +Profiling_tools +Property_map +STL_Extension +Stream_support +Surface_mesh_simplification diff --git a/Surface_mesh_skeletonization/package_info/Surface_mesh_skeletonization/dependencies b/Surface_mesh_skeletonization/package_info/Surface_mesh_skeletonization/dependencies new file mode 100644 index 00000000000..2cc298a12e8 --- /dev/null +++ b/Surface_mesh_skeletonization/package_info/Surface_mesh_skeletonization/dependencies @@ -0,0 +1,39 @@ + +AABB_tree +Algebraic_foundations +Arithmetic_kernel +BGL +Cartesian_kernel +Circulator +Distance_2 +Distance_3 +Filtered_kernel +Generator +HalfedgeDS +Hash_map +Homogeneous_kernel +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Kernel_d +Modifier +Modular_arithmetic +Number_types +Point_set_processing_3 +Polygon +Polygon_mesh_processing +Polyhedron +Polyhedron_IO +Profiling_tools +Property_map +Random_numbers +STL_Extension +Solver_interface +Spatial_searching +Spatial_sorting +Stream_support +Surface_mesh_skeletonization +TDS_3 +Triangulation_3 diff --git a/Surface_mesher/include/CGAL/IO/facets_in_complex_2_to_triangle_mesh.h b/Surface_mesher/include/CGAL/IO/facets_in_complex_2_to_triangle_mesh.h index 6714ab72948..dd7935fb224 100644 --- a/Surface_mesher/include/CGAL/IO/facets_in_complex_2_to_triangle_mesh.h +++ b/Surface_mesher/include/CGAL/IO/facets_in_complex_2_to_triangle_mesh.h @@ -26,6 +26,7 @@ #include #include #include +#include namespace CGAL{ /*! diff --git a/Surface_mesher/package_info/Surface_mesher/dependencies b/Surface_mesher/package_info/Surface_mesher/dependencies new file mode 100644 index 00000000000..29c5340c50a --- /dev/null +++ b/Surface_mesher/package_info/Surface_mesher/dependencies @@ -0,0 +1,37 @@ + +Algebraic_foundations +Arithmetic_kernel +BGL +CGAL_ImageIO +Cartesian_kernel +Circulator +Distance_2 +Distance_3 +Filtered_kernel +Generator +HalfedgeDS +Hash_map +Homogeneous_kernel +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Kernel_d +Mesher_level +Modifier +Modular_arithmetic +Number_types +Polygon +Polyhedron +Polyhedron_IO +Profiling_tools +Property_map +Random_numbers +STL_Extension +Spatial_sorting +Stream_support +Surface_mesher +TDS_3 +Triangulation_3 +Union_find diff --git a/Surface_sweep_2/package_info/Surface_sweep_2/dependencies b/Surface_sweep_2/package_info/Surface_sweep_2/dependencies new file mode 100644 index 00000000000..32a4ac1d42c --- /dev/null +++ b/Surface_sweep_2/package_info/Surface_sweep_2/dependencies @@ -0,0 +1,21 @@ + +Algebraic_foundations +Arithmetic_kernel +Arrangement_on_surface_2 +Cartesian_kernel +Distance_2 +Distance_3 +Filtered_kernel +Homogeneous_kernel +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Kernel_d +Modular_arithmetic +Number_types +Profiling_tools +STL_Extension +Stream_support +Surface_sweep_2 diff --git a/TDS_2/package_info/TDS_2/dependencies b/TDS_2/package_info/TDS_2/dependencies new file mode 100644 index 00000000000..4d1feaf20b8 --- /dev/null +++ b/TDS_2/package_info/TDS_2/dependencies @@ -0,0 +1,11 @@ + +Algebraic_foundations +Circulator +Hash_map +Installation +Kernel_23 +Profiling_tools +STL_Extension +Stream_support +TDS_2 +Triangulation_2 diff --git a/TDS_3/package_info/TDS_3/dependencies b/TDS_3/package_info/TDS_3/dependencies new file mode 100644 index 00000000000..7991cac393b --- /dev/null +++ b/TDS_3/package_info/TDS_3/dependencies @@ -0,0 +1,14 @@ + +Algebraic_foundations +Circulator +Hash_map +Installation +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +Profiling_tools +STL_Extension +Stream_support +TDS_3 +Triangulation_3 diff --git a/Testsuite/package_info/Testsuite/dependencies b/Testsuite/package_info/Testsuite/dependencies new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Triangulation/package_info/Triangulation/dependencies b/Triangulation/package_info/Triangulation/dependencies new file mode 100644 index 00000000000..185b8e3f767 --- /dev/null +++ b/Triangulation/package_info/Triangulation/dependencies @@ -0,0 +1,15 @@ + +Algebraic_foundations +Circulator +Installation +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +Polygon +Profiling_tools +Random_numbers +STL_Extension +Spatial_sorting +Stream_support +Triangulation diff --git a/Triangulation_2/include/CGAL/Regular_triangulation_2.h b/Triangulation_2/include/CGAL/Regular_triangulation_2.h index c601986cad5..3ee7c5e338f 100644 --- a/Triangulation_2/include/CGAL/Regular_triangulation_2.h +++ b/Triangulation_2/include/CGAL/Regular_triangulation_2.h @@ -60,6 +60,7 @@ class Regular_triangulation_2 public: typedef Self Triangulation; + typedef Triangulation_2 Triangulation_base; typedef Tds Triangulation_data_structure; typedef Gt Geom_traits; diff --git a/Triangulation_2/include/CGAL/boost/graph/graph_traits_Regular_triangulation_2.h b/Triangulation_2/include/CGAL/boost/graph/graph_traits_Regular_triangulation_2.h index fdea8e44434..6c5fc6c41c6 100644 --- a/Triangulation_2/include/CGAL/boost/graph/graph_traits_Regular_triangulation_2.h +++ b/Triangulation_2/include/CGAL/boost/graph/graph_traits_Regular_triangulation_2.h @@ -55,7 +55,7 @@ namespace boost { typedef CGAL::detail::Edge, typename CGAL::Regular_triangulation_2::Edge> edge_descriptor; typedef typename CGAL::Regular_triangulation_2::All_edges_iterator edge_iterator; - typedef CGAL::detail::T2_halfedge_descriptor halfedge_descriptor; + typedef CGAL::detail::T2_halfedge_descriptor halfedge_descriptor; typedef typename Regular_triangulation::All_halfedges_iterator halfedge_iterator; diff --git a/Triangulation_2/package_info/Triangulation_2/dependencies b/Triangulation_2/package_info/Triangulation_2/dependencies new file mode 100644 index 00000000000..de02c299bee --- /dev/null +++ b/Triangulation_2/package_info/Triangulation_2/dependencies @@ -0,0 +1,28 @@ + +Algebraic_foundations +Arithmetic_kernel +BGL +Cartesian_kernel +Circulator +Distance_2 +Distance_3 +Filtered_kernel +Geomview +Hash_map +Homogeneous_kernel +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Kernel_d +Modular_arithmetic +Number_types +Polygon +Profiling_tools +Property_map +STL_Extension +Spatial_sorting +Stream_support +TDS_2 +Triangulation_2 diff --git a/Triangulation_3/doc/Triangulation_3/Concepts/DelaunayTriangulationTraits_3.h b/Triangulation_3/doc/Triangulation_3/Concepts/DelaunayTriangulationTraits_3.h index a92e75955bc..f7812c32d9f 100644 --- a/Triangulation_3/doc/Triangulation_3/Concepts/DelaunayTriangulationTraits_3.h +++ b/Triangulation_3/doc/Triangulation_3/Concepts/DelaunayTriangulationTraits_3.h @@ -81,6 +81,29 @@ It is only needed when using the `Fast_location` policy or the typedef unspecified_type Compare_distance_3; +/// @} + +/// \name +/// When `is_Gabriel` functions are used, the traits class must +/// in addition provide the following predicate object: +/// @{ + +/*! +A predicate object that must provide the function operators + +`Bounded_side operator()(Point_3 p, Point_3 q, Point_3 t)`, + +which returns the position of the point `t` relative to the sphere +that has `pq` as its diameter, + +`Bounded_side operator()(Point_3 p, Point_3 q, Point_3 r, Point_3 t)`, + +which returns the position of the point `t` relative to the sphere +passing through `p, q`, and `r` and whose center is in the +plane defined by these three points. +*/ +typedef unspecified_type Side_of_bounded_sphere_3; + /// @} /*! \name @@ -166,8 +189,6 @@ When using the `Fast_location` policy or the `CGAL::Delaunay_triangulation_3::ne */ Compare_distance_3 compare_distance_3_object(); - - /// @} /*! \name diff --git a/Triangulation_3/doc/Triangulation_3/Concepts/RegularTriangulationTraits_3.h b/Triangulation_3/doc/Triangulation_3/Concepts/RegularTriangulationTraits_3.h index bf16e8b37ef..dd6c787c8a5 100644 --- a/Triangulation_3/doc/Triangulation_3/Concepts/RegularTriangulationTraits_3.h +++ b/Triangulation_3/doc/Triangulation_3/Concepts/RegularTriangulationTraits_3.h @@ -210,6 +210,34 @@ typedef unspecified_type Construct_ray_3; /// @} +/// \name +/// When `is_Gabriel` functions are used, the traits class must +/// in addition provide the following predicate object: +/// @{ + +/*! +A predicate object that must provide the function operators + +`Bounded_side operator()(Weighted_point_3 p, Weighted_point_3 t)`, + +which returns the sign of the power test of `t` with respect to the smallest +sphere orthogonal to `p` (which is the sphere with center `p` and squared +radius `-w_p` with `w_p` the weight of `p`), + +`Bounded_side operator()(Weighted_point_3 p, Weighted_point_3 q, Weighted_point_3 t)`, + +which returns the sign of the power test of `t` with respect to the smallest +sphere orthogonal to `p` and `q`, + +`Bounded_side operator()(Weighted_point_3 p, Weighted_point_3 q, Weighted_point_3 r, Weighted_point_3 t)`, + +which returns the sign of the power test of `t` with respect to the smallest +sphere orthogonal to `p`, `q`, and `r`. +*/ +typedef unspecified_type Power_side_of_bounded_power_sphere_3; + +/// @} + /// \name Operations /// @{ diff --git a/Triangulation_3/include/CGAL/Regular_triangulation_3.h b/Triangulation_3/include/CGAL/Regular_triangulation_3.h index bfb6e10e51c..c1464580d6d 100644 --- a/Triangulation_3/include/CGAL/Regular_triangulation_3.h +++ b/Triangulation_3/include/CGAL/Regular_triangulation_3.h @@ -2184,8 +2184,16 @@ namespace CGAL { Regular_triangulation_3:: is_Gabriel(Vertex_handle v) const { - return nearest_power_vertex( - geom_traits().construct_point_3_object()(v->point()), v->cell()) == v; + typename Geom_traits::Power_side_of_bounded_power_sphere_3 + side_of_bounded_orthogonal_sphere = + geom_traits().power_side_of_bounded_power_sphere_3_object(); + + Vertex_handle nearest_v = + nearest_power_vertex(geom_traits().construct_point_3_object()(v->point()), + v->cell()); + + return (side_of_bounded_orthogonal_sphere(v->point(), nearest_v->point()) + != CGAL::ON_BOUNDED_SIDE); } // Returns diff --git a/Triangulation_3/package_info/Triangulation_3/dependencies b/Triangulation_3/package_info/Triangulation_3/dependencies new file mode 100644 index 00000000000..ee6043a1047 --- /dev/null +++ b/Triangulation_3/package_info/Triangulation_3/dependencies @@ -0,0 +1,28 @@ + +Algebraic_foundations +Arithmetic_kernel +BGL +Cartesian_kernel +Circulator +Distance_2 +Distance_3 +Filtered_kernel +Geomview +Hash_map +Homogeneous_kernel +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Kernel_d +Modular_arithmetic +Number_types +Polygon +Profiling_tools +Property_map +STL_Extension +Spatial_sorting +Stream_support +TDS_3 +Triangulation_3 diff --git a/Union_find/package_info/Union_find/dependencies b/Union_find/package_info/Union_find/dependencies new file mode 100644 index 00000000000..e323621c3b0 --- /dev/null +++ b/Union_find/package_info/Union_find/dependencies @@ -0,0 +1,10 @@ + +Algebraic_foundations +Installation +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +Profiling_tools +STL_Extension +Stream_support diff --git a/Visibility_2/package_info/Visibility_2/dependencies b/Visibility_2/package_info/Visibility_2/dependencies new file mode 100644 index 00000000000..e9f887bd142 --- /dev/null +++ b/Visibility_2/package_info/Visibility_2/dependencies @@ -0,0 +1,26 @@ + +Algebraic_foundations +Arrangement_on_surface_2 +Circulator +Distance_2 +Filtered_kernel +HalfedgeDS +Hash_map +Installation +Intersections_2 +Intersections_3 +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +Polygon +Principal_component_analysis_LGPL +Profiling_tools +Property_map +STL_Extension +Spatial_sorting +Stream_support +Surface_sweep_2 +TDS_2 +Triangulation_2 +Visibility_2 diff --git a/Voronoi_diagram_2/package_info/Voronoi_diagram_2/dependencies b/Voronoi_diagram_2/package_info/Voronoi_diagram_2/dependencies new file mode 100644 index 00000000000..e24f839a450 --- /dev/null +++ b/Voronoi_diagram_2/package_info/Voronoi_diagram_2/dependencies @@ -0,0 +1,16 @@ + +Algebraic_foundations +Apollonius_graph_2 +Circulator +Hash_map +Installation +Interval_support +Kernel_23 +Modular_arithmetic +Number_types +Profiling_tools +STL_Extension +Stream_support +TDS_2 +Triangulation_2 +Voronoi_diagram_2