Merge pull request CGAL#1530 from lrineau/Installation-compute_depend…

…encies-GF Compute and fix packages dependencies
fcacciola · Oct 5, 2016 · 223c1cf · 223c1cf
2 parents 8f33571 + befe820
commit 223c1cf
Show file tree

Hide file tree

Showing 261 changed files with 2,455 additions and 902 deletions.
diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/PointsGraphicsItem.h b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/PointsGraphicsItem.h
@@ -22,6 +22,7 @@
 
 #include <vector>
 #include <CGAL/Qt/GraphicsItem.h>
+#include <CGAL/number_utils.h>
 #include <QPen>
 
 class QPainter;

diff --git a/.../boost/graph/graph_traits_Arrangement_2.h → .../boost/graph/graph_traits_Arrangement_2.h b/.../boost/graph/graph_traits_Arrangement_2.h → .../boost/graph/graph_traits_Arrangement_2.h
diff --git a/...t/graph/graph_traits_Dual_Arrangement_2.h → ...t/graph/graph_traits_Dual_Arrangement_2.h b/...t/graph/graph_traits_Dual_Arrangement_2.h → ...t/graph/graph_traits_Dual_Arrangement_2.h
diff --git a/BGL/include/CGAL/boost/graph/Dual.h b/BGL/include/CGAL/boost/graph/Dual.h
@@ -22,6 +22,7 @@
 
 #include <CGAL/boost/graph/properties.h>
 #include <boost/range/distance.hpp>
+#include <CGAL/boost/graph/iterator.h>
 
 namespace CGAL {
 

diff --git a/BGL/include/CGAL/boost/graph/helpers.h b/BGL/include/CGAL/boost/graph/helpers.h
@@ -25,7 +25,6 @@
 #include <CGAL/boost/graph/iterator.h>
 #include <CGAL/boost/graph/properties.h>
 #include <CGAL/boost/graph/internal/Has_member_clear.h>
-#include <CGAL/boost/graph/Euler_operations.h>
 
 namespace CGAL {
 
@@ -720,4 +719,8 @@ void clear(FaceGraph& g)
 
 } // namespace CGAL
 
+// Include "Euler_operations.h" at the end, because its implementation
+// requires this header.
+#include <CGAL/boost/graph/Euler_operations.h>
+
 #endif // CGAL_BOOST_GRAPH_HELPERS_H
diff --git a/BGL/include/CGAL/boost/graph/split_graph_into_polylines.h b/BGL/include/CGAL/boost/graph/split_graph_into_polylines.h
@@ -25,7 +25,7 @@
 #include <boost/foreach.hpp>
 #include <boost/graph/adjacency_list.hpp>
 #include <iostream>
-
+#include <CGAL/assertions.h>
 
 namespace CGAL {
 

diff --git a/Boolean_set_operations_2/doc/Boolean_set_operations_2/CGAL/General_polygon_with_holes_2.h b/Boolean_set_operations_2/doc/Boolean_set_operations_2/CGAL/General_polygon_with_holes_2.h
diff --git a/Boolean_set_operations_2/doc/Boolean_set_operations_2/CGAL/Polygon_with_holes_2.h b/Boolean_set_operations_2/doc/Boolean_set_operations_2/CGAL/Polygon_with_holes_2.h
diff --git a/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/GeneralPolygonWithHoles_2.h b/Boolean_set_operations_2/doc/Boolean_set_operations_2/Concepts/GeneralPolygonWithHoles_2.h
diff --git a/Boolean_set_operations_2/doc/Boolean_set_operations_2/PackageDescription.txt b/Boolean_set_operations_2/doc/Boolean_set_operations_2/PackageDescription.txt
@@ -37,15 +37,13 @@ containment predicates.
 - `GpsTraitsGeneralPolygon_2`
 - `GpsTraitsGeneralPolygonWithHoles_2`
 - `GeneralPolygon_2`
-- `GeneralPolygonWithHoles_2`
 - `ArrangementDirectionalXMonotoneTraits_2`
 - `GeneralPolygonSetTraits_2`
 - `GeneralPolygonSetDcel`
 - `GeneralPolygonSetDcelFace`
 - `GeneralPolygonSetDcelHalfedge`
 
 ## Classes ##
-- `CGAL::Polygon_with_holes_2<Kernel,Container>`
 - `CGAL::Polygon_set_2<Kernel,Container,Dcel>`
 - `CGAL::General_polygon_set_2<Traits,Dcel>`
 - `CGAL::General_polygon_2<ArrTraits>`
@@ -64,8 +62,5 @@ containment predicates.
 - \link boolean_symmetric_difference `CGAL::symmetric_difference()` \endlink
 - \link boolean_oriented_side `CGAL::oriented_side()` \endlink
 - \link boolean_connect_holes `CGAL::connect_holes()` \endlink
-- `operator<<()` for `CGAL::Polygon_with_holes_2`, `CGAL::General_polygon_2` and `CGAL::General_polygon_with_holes_2`
-- `operator>>()` for `CGAL::Polygon_with_holes_2`, `CGAL::General_polygon_2` and `CGAL::General_polygon_with_holes_2`
-
 
 */
diff --git a/Boolean_set_operations_2/include/CGAL/IO/Dxf_bsop_reader.h b/Boolean_set_operations_2/include/CGAL/IO/Dxf_bsop_reader.h
@@ -28,6 +28,7 @@
 #include <list>
 #include <CGAL/Gps_circle_segment_traits_2.h>
 #include <CGAL/General_polygon_set_2.h>
+#include <CGAL/squared_distance_2.h>
 
 namespace CGAL {
 

diff --git a/CGAL_ipelets/demo/CGAL_ipelets/CMakeLists.txt b/CGAL_ipelets/demo/CGAL_ipelets/CMakeLists.txt
@@ -24,40 +24,31 @@ find_package(CGAL QUIET COMPONENTS Core)
 if ( CGAL_FOUND )
   include( ${CGAL_USE_FILE} )
 
-  find_package(IPE)
+  find_package(IPE 6)
 
   if ( IPE_FOUND )
     include_directories(BEFORE ${IPE_INCLUDE_DIR})
 
-    #check IPE version
-    FILE(READ "${IPE_INCLUDE_DIR}/ipebase.h" IPEBASE_H)
-    STRING(REGEX MATCH "IPELIB_VERSION[ ]*=[ ]*([67])([0-9][0-9])([0-9][0-9]);" FOUND_IPE_VERSION "${IPEBASE_H}")
-    if (FOUND_IPE_VERSION)
-      set(IPE_VERSION ${CMAKE_MATCH_1})
-      set(IPE_MINOR_VERSION_1 ${CMAKE_MATCH_2})
-      set(IPE_MINOR_VERSION_2 ${CMAKE_MATCH_3})
-
-      if (${IPE_VERSION} EQUAL "7")
-        set(WITH_IPE_7 ON)
-      elseif(${IPE_VERSION} EQUAL "6")
-        set(WITH_IPE_7 OFF)
-      else()
-        message("-- Error: ${IPE_VERSION} is not a supported version of IPE (only 6 and 7 are).")
-        set(IPE_FOUND FALSE)
-      endif()
-      # starting ipe 7.2.1, a compiler with c++11 must be used to compile ipelets
-      if (${IPE_VERSION} EQUAL "7" AND
-          ${IPE_MINOR_VERSION_1} GREATER "1" AND
-          ${IPE_MINOR_VERSION_2} GREATER "0")
-        message(STATUS "Starting from Ipe 7.2.1 a compiler with c++11 support must be used")
-        include(CheckCXXCompilerFlag)
-        CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
-        CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
-        if(COMPILER_SUPPORTS_CXX11)
-            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-        elseif(COMPILER_SUPPORTS_CXX0X)
-            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
-        endif()
+    if (${IPE_VERSION} EQUAL "7")
+      set(WITH_IPE_7 ON)
+    elseif(${IPE_VERSION} EQUAL "6")
+      set(WITH_IPE_7 OFF)
+    else()
+      message("-- Error: ${IPE_VERSION} is not a supported version of IPE (only 6 and 7 are).")
+      set(IPE_FOUND FALSE)
+    endif()
+    # starting ipe 7.2.1, a compiler with c++11 must be used to compile ipelets
+    if (${IPE_VERSION} EQUAL "7" AND
+        ${IPE_MINOR_VERSION_1} GREATER "1" AND
+        ${IPE_MINOR_VERSION_2} GREATER "0")
+      message(STATUS "Starting from Ipe 7.2.1 a compiler with c++11 support must be used")
+      include(CheckCXXCompilerFlag)
+      CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
+      CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
+      if(COMPILER_SUPPORTS_CXX11)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+      elseif(COMPILER_SUPPORTS_CXX0X)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
       endif()
     endif()
   endif()

diff --git a/Circular_kernel_2/include/CGAL/Circular_kernel_2/Circular_arc_point_2.h b/Circular_kernel_2/include/CGAL/Circular_kernel_2/Circular_arc_point_2.h
@@ -27,6 +27,7 @@
 #define CGAL_CIRCULAR_KERNEL_CIRCULAR_ARC_POINT_2_H
 
 #include <iostream>
+#include <CGAL/Handle.h>
 #include <CGAL/Bbox_2.h>
 #include <CGAL/Interval_nt.h>
 #include <boost/type_traits/is_same.hpp>

diff --git a/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_circle_2.h b/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_circle_2.h
@@ -27,6 +27,7 @@
 #define CGAL_CIRCULAR_KERNEL_INTERNAL_FUNCTIONS_ON_CIRCLE_2_H
 
 #include <CGAL/Circular_kernel_2/Intersection_traits.h>
+#include <vector>
 
 namespace CGAL {