Skip to content
GitLab
Explore
Sign in
Register
Commits on Source (2)
Add patch to find CGAL before Boost, to not overwrite Boost_LIBRARIES.
· 601210a1
Bas Couwenberg
authored
Jun 29, 2018
601210a1
Set distribution to unstable.
· f6afc3ae
Bas Couwenberg
authored
Jun 29, 2018
f6afc3ae
Show whitespace changes
Inline
Side-by-side
debian/changelog
View file @
f6afc3ae
sfcgal (1.3.5-3) unstable; urgency=medium
* Add patch to find CGAL before Boost, to not overwrite Boost_LIBRARIES.
-- Bas Couwenberg <sebastic@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
0 → 100644
View file @
f6afc3ae
Description: Find CGAL before Boost to prevent it overwriting Boost_LIBRARIES.
Author: Bas Couwenberg <sebastic@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
View file @
f6afc3ae
0001-add-missing-boost-lib-requirements-in-tests-and-exam.patch
cgal-boost.patch