Merge pull request #1188 from cvvergara/alpha

Removing CGAL

.travis.yml

@@ -48,7 +48,6 @@ addons:
       - cmake
       - libboost-thread-dev
       - libboost-graph-dev
-      - libcgal-dev
       - python-sphinx
       - graphviz
       - texlive

CMakeLists.txt

@@ -60,7 +60,6 @@ set(DOXYGEN_MINIMUM_VERSION "1.7")
 set(SPHINX_MINIMUM_VERSION "1.1")
 set(POSTGRESQL_MINIMUM_VERSION "9.2.0")
 set(BOOST_MINIMUM_VERSION "1.53")
-set(CGAL_CXX_MINIMUM_VERSION "4.4")
 set(POSTGIS_MINIMUM_VERSION "2.0.0")
 set(GNU_CXX_MINIMUM_VERSION "4.6")
 set(MSVC_CXX_MINIMUM_VERSION "18.0")
@@ -136,17 +135,8 @@ if(WIN32 AND NOT MSVC)
         set(BOOST_ROOT c:/ming${OS_BUILD}/msys/local)
     endif(NOT BOOST_ROOT)
 
-    if (NOT CGAL_ROOT)
-        set(CGAL_ROOT c:/ming${OS_BUILD}/msys/local)
-    endif(NOT CGAL_ROOT)
-
-    if (NOT GMP_ROOT)
-        set(GMP_ROOT c:/ming${OS_BUILD}/mingw${OS_BUILD})
-    endif(NOT GMP_ROOT)
     if (PGROUTING_DEBUG)
         message(STATUS "OS_BUILD=${OS_BUILD}")
-        message(STATUS "CGAL_ROOT=${CGAL_ROOT}")
-        message(STATUS "GMP_ROOT=${GMP_ROOT}")
         message(STATUS "BOOST_ROOT=${BOOST_ROOT}")
         message(STATUS "CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}")
     endif()
@@ -246,22 +236,19 @@ else()
     set(BOOST_VERSION_OK "1")
 endif()
 
-message(STATUS "Boost VERSION ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}")
-message(STATUS "BOOST_VERSION_OK ${BOOST_VERSION_OK}")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBOOST_VERSION_OK=${BOOST_VERSION_OK}")
+# Boost Geometry structure is different
+if ("${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}" VERSION_LESS "1.56.0")
+    set(BOOST_Geometry_VERSION_OK "0")
+else()
+    set(BOOST_Geometry_VERSION_OK "1")
+endif()
 
-#---------------------------------------------
-#---------------------------------------------
-# CGAL
-#---------------------------------------------
-#---------------------------------------------
-find_package(CGAL ${CGAL_MINIMUM_VERSION})
-if(NOT CGAL_FOUND)
-    message(FATAL_ERROR " Please check your CGAL installation, or set correct path to CGAL_INCLUDE_DIR and CGAL_LIBRARIES.")
-endif(NOT CGAL_FOUND)
 
-#-------
-include_directories(${CGAL_INCLUDE_DIR})
+
+message(STATUS "Boost VERSION ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}")
+message(STATUS "BOOST_VERSION_OK ${BOOST_VERSION_OK}")
+message(STATUS "BOOST_Geometry_VERSION_OK ${BOOST_Geometry_VERSION_OK}")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBOOST_VERSION_OK=${BOOST_VERSION_OK} -DBOOST_Geometry_VERSION_OK=${BOOST_Geometry_VERSION_OK}")
 
 #---------------------------------------------
 #---------------------------------------------
@@ -284,7 +271,6 @@ if (PGROUTING_DEBUG)
     message(STATUS "PGSQL_VERSION is ${PGSQL_VERSION}")
     message(STATUS "Boost_INCLUDE_DIRS: ${Boost_INCLUDE_DIRS}")
     message(STATUS "BOOST_VERSION_OK ${BOOST_VERSION_OK}")
-    message(STATUS "CGAL_INCLUDE_DIR: ${CGAL_INCLUDE_DIR}")
     message(STATUS "PGROUTING_INCLUDE_DIRECTORIES = ${PGROUTING_INCLUDE_DIRECTORIES}")
     message(STATUS "POSTGRESQL_INCLUDE_DIR = ${POSTGRESQL_INCLUDE_DIR}")
     message(STATUS "Boost_INCLUDE_DIRS = ${Boost_INCLUDE_DIRS}")
@@ -393,7 +379,7 @@ endif()
 
 # TODO use -Werror when TRSP gets rewritten
 set(CMAKE_C_FLAGS_DEBUG   "${CMAKE_C_FLAGS_DEBUG}   -Wall -Wconversion -Wmissing-prototypes -W -Wunused -Wuninitialized -Wextra -Wdouble-promotion")
-set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -fno-implicit-inline-templates -Wconversion -pedantic -W -Wunused -Wuninitialized -Wextra -Wdouble-promotion")
+set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wconversion -pedantic -W -Wunused -Wuninitialized -Wextra -Wdouble-promotion")
 
 
 
@@ -449,7 +435,7 @@ else(APPLE)
 endif(APPLE)
 
 
-LINK_LIBRARIES(${CGAL_LIBRARIES} ${GMP_LIBRARIES} ${BOOST_THREAD_LIBRARIES})
+LINK_LIBRARIES(${BOOST_THREAD_LIBRARIES})
 
 #-------------------
 # pgRouting objects to be linked

NEWS

@@ -5,6 +5,7 @@ pgRouting 3.0.0 Release Notes
 *Fixed Issues*
 
 * [#1153 ](https://github.com/pgRouting/pgrouting/issues/1153)_: Renamed pgr_eucledianTSP to pgr_TSPeuclidean
+* [#1188 ](https://github.com/pgRouting/pgrouting/issues/1188)_: Removed CGAL dependency
 
 *New Experimental functions*
 
@@ -102,6 +103,8 @@ pgRouting 3.0.0 Release Notes
     * pgr_maximumcardinalitymatching
 
 * TSP old signatures
+* pgr_pointsAsPolygon
+* pgr_alphaShape old signature
 
 
 

README.md

@@ -6,9 +6,8 @@
 
 ### Branches
 
-* The *master* branch has the release  2.5.2
-* The *release/2.5* branch has the next micro-release 2.5.3 (if needed)
-* The *develop* branch has the development of the next minor-release 2.6.0-dev
+* The *master* branch has the latest release
+* The *develop* branch has the development of the next release
 
 For the complete list of releases go to:
 https://github.com/pgRouting/pgrouting/releases
@@ -78,9 +77,6 @@ This library contains following features:
 * K-Shortest Path, Multiple Alternative Paths (Yen's algorithm)
 * Traveling Sales Person (TSP)
 * Turn Restriction Shortest Path (TRSP)
-
-Additionally, ready for testing and to be part of 2.5 official version:
-
 * Shortest Path Dijkstra With Points Family of functions
 * Shortest Path Dijkstra Cost With Points Family of functions
 * Driving Distance With Points
@@ -89,25 +85,17 @@ Additionally, ready for testing and to be part of 2.5 official version:
 
 and many more.
 
-Family of functions include:
-
-* one to one
-* one to many
-* many to one
-* many to many
-
 ## REQUIREMENTS
 
 Building reqirements
 --------------------
 * Perl
 * C and C++ compilers
-  * GNU >= 4.6
+  * GNU >= 4.8
   * MSVC >= 18.0
-* Postgresql >= 9.2
+* Postgresql >= 9.4
 * The Boost Graph Library (BGL) >= 1.53
 * CMake >= 3.2
-* CGAL >= 4.4
 * Sphinx >= 1.2
 
 
@@ -144,7 +132,7 @@ Build with documentation (requires [Sphinx](http://sphinx-doc.org/))
 
 	cmake -DWITH_DOC=ON ..
 
-Postgresql 9.2+
+Postgresql 9.3+
 
 	createdb mydatabase
 	psql mydatabase -c "CREATE EXTENSION postgis"

appveyor.yml

@@ -42,11 +42,10 @@ install:
 
 build_script:
   - cd c:\build\pgrouting\ci\appveyor
-  - msbuild_pgrouting.bat %PG_VER% 
+  - msbuild_pgrouting.bat %PG_VER%
   - cd %PGROUTING_BUILD_DIR%
   - msbuild PGROUTING.sln /target:Build /property:Configuration=%CONFIGURATION%
   - msbuild INSTALL.vcxproj /target:Build /property:Configuration=%CONFIGURATION%
-  - copy c:\build\gmp\x64\lib\*.dll C:\Progra~1\PostgreSQL\%PG_VER%\bin\
 
 test_script:
   - set PGUSER=postgres