[Git][debian-gis-team/sfcgal][master] 2 commits: Add patch to find CGAL before Boost, to not overwrite Boost_LIBRARIES.

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian GIS Project / sfcgal


Commits:
601210a1 by Bas Couwenberg at 2018-06-29T18:41:31+02:00
Add patch to find CGAL before Boost, to not overwrite Boost_LIBRARIES.

- - - - -
f6afc3ae by Bas Couwenberg at 2018-06-29T18:41:44+02:00
Set distribution to unstable.

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/cgal-boost.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sfcgal (1.3.5-3) unstable; urgency=medium
+
+  * Add patch to find CGAL before Boost, to not overwrite Boost_LIBRARIES.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Fri, 29 Jun 2018 18:41:35 +0200
+
 sfcgal (1.3.5-2) unstable; urgency=medium
 
   * Strip trailing whitespace from rules file.


=====================================
debian/patches/cgal-boost.patch
=====================================
--- /dev/null
+++ b/debian/patches/cgal-boost.patch
@@ -0,0 +1,60 @@
+Description: Find CGAL before Boost to prevent it overwriting Boost_LIBRARIES.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://github.com/Oslandia/SFCGAL/pull/169
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -39,6 +39,26 @@ include( Libtoolize )
+ # dependencies
+ #-----------------------------------------------------------
+ 
++#-- find CGAL  ---------------------------------------------
++option( CGAL_USE_AUTOLINK "disable CGAL autolink" OFF )
++if( ${CGAL_USE_AUTOLINK} )
++	add_definitions( "-DCGAL_NO_AUTOLINK" )
++endif()
++
++find_package( CGAL 4.3 COMPONENTS Core REQUIRED )
++message( STATUS "CGAL ${CGAL_VERSION} found" )
++
++include_directories( ${CMAKE_BINARY_DIR}/include )
++
++# For CGAL versions < 4.3, we add a local directory that contains some tweaked include files from unreleased versions
++# They will overwrite files from the CGAL installation
++if( "${CGAL_VERSION}" VERSION_LESS "4.3" )
++  include_directories( patches/CGAL-4.2 )
++elseif( "${CGAL_VERSION}" VERSION_LESS "4.10")
++  include_directories( patches/CGAL-4.3 )
++  add_definitions( "-DCGAL_INTERSECTION_VERSION=1" )
++endif()
++
+ #-- BOOST --------------------------------------------------
+ option( Boost_USE_AUTO_LINK "boost use autolink" OFF )
+ if( NOT ${Boost_USE_AUTO_LINK} )
+@@ -93,26 +113,6 @@ if ( SFCGAL_WITH_OSG )
+   endif()
+ endif()
+ 
+-#-- find CGAL  ---------------------------------------------
+-option( CGAL_USE_AUTOLINK "disable CGAL autolink" OFF )
+-if( ${CGAL_USE_AUTOLINK} )
+-	add_definitions( "-DCGAL_NO_AUTOLINK" )
+-endif()
+-
+-find_package( CGAL 4.3 COMPONENTS Core REQUIRED )
+-message( STATUS "CGAL ${CGAL_VERSION} found" )
+-
+-include_directories( ${CMAKE_BINARY_DIR}/include )
+-
+-# For CGAL versions < 4.3, we add a local directory that contains some tweaked include files from unreleased versions
+-# They will overwrite files from the CGAL installation
+-if( "${CGAL_VERSION}" VERSION_LESS "4.3" )
+-  include_directories( patches/CGAL-4.2 )
+-elseif( "${CGAL_VERSION}" VERSION_LESS "4.10")
+-  include_directories( patches/CGAL-4.3 )
+-  add_definitions( "-DCGAL_INTERSECTION_VERSION=1" )
+-endif()
+-
+ #-- note that SYSTEM turns -I/path to -isystem and avoid warnings in CGAL and Boost
+ include_directories( SYSTEM 
+ 	${CGAL_INCLUDE_DIRS}


=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-add-missing-boost-lib-requirements-in-tests-and-exam.patch
+cgal-boost.patch



View it on GitLab: https://salsa.debian.org/debian-gis-team/sfcgal/compare/f7f529e6ef2b9c2135cfdb28f92aca218d53145f...f6afc3ae4a2b838b82c62abc4100b7b704bd2e0c

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/sfcgal/compare/f7f529e6ef2b9c2135cfdb28f92aca218d53145f...f6afc3ae4a2b838b82c62abc4100b7b704bd2e0c
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20180629/203b02e0/attachment-0001.html>