<pre style='margin:0'>
Vincent (Veence) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/35d793dffcc6518b63c78227c671b5c0fdb4eff9">https://github.com/macports/macports-ports/commit/35d793dffcc6518b63c78227c671b5c0fdb4eff9</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 35d793d sfcgal: add two variants to specify which cgal version to link against
</span>35d793d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 35d793dffcc6518b63c78227c671b5c0fdb4eff9
</span>Author: Veence <vince@macports.org>
AuthorDate: Wed May 13 21:44:04 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> sfcgal: add two variants to specify which cgal version to link against
</span>---
gis/sfcgal/Portfile | 15 ++++++++++++---
gis/sfcgal/files/patch-CMakeLists_txt.diff | 27 +++++++++++++++++++++++++++
2 files changed, 39 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/sfcgal/Portfile b/gis/sfcgal/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 041223a..2e189a9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/sfcgal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/sfcgal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,18 +20,27 @@ license LGPL-2
</span> homepage http://www.sfcgal.org/
github.setup Oslandia SFCGAL 1.3.7 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> name sfcgal
checksums rmd160 f00fb41b2df64cf3aa3e23d1aa02252f139d880a \
sha256 1f0707242cf0efb7744a77128ef0cdac792282e90e5932d6bbbe8bf114b40ac0 \
size 2473937
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:cgal4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:mpfr \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:mpfr \
</span> port:gmp
# Variants
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant cgal4 conflicts cgal5 description "builds with CGAL 4" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:cgal4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant cgal5 conflicts cgal4 description "builds with CGAL 5" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:cgal5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-CMakeLists_txt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset cgal5] && ![variant_isset cgal4]} {default_variants +cgal5}
</span>
variant viewer description {builds a Qt4-based viewer} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/sfcgal/files/patch-CMakeLists_txt.diff b/gis/sfcgal/files/patch-CMakeLists_txt.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..c518d88
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/sfcgal/files/patch-CMakeLists_txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2020-05-13 21:33:51.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2020-05-13 21:34:30.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -54,22 +54,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_definitions( "-DCGAL_NO_AUTOLINK" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# 4.3 minimal
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# 4.13 recommended
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-find_package( CGAL 4.3 COMPONENTS Core REQUIRED )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# 5.0 minimal
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++find_package( CGAL 5.0 COMPONENTS Core REQUIRED )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message( STATUS "CGAL ${CGAL_VERSION} found" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include_directories( ${CMAKE_BINARY_DIR}/include )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# For CGAL versions < 4.3, we add a local directory that contains some tweaked include files from unreleased versions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# They will overwrite files from the CGAL installation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if( "${CGAL_VERSION}" VERSION_LESS "4.3" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- include_directories( patches/CGAL-4.2 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-elseif( "${CGAL_VERSION}" VERSION_LESS "4.10")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- include_directories( patches/CGAL-4.3 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_definitions( "-DCGAL_INTERSECTION_VERSION=1" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #-- BOOST --------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ option( Boost_USE_AUTO_LINK "boost use autolink" OFF )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( NOT ${Boost_USE_AUTO_LINK} )
</span></pre><pre style='margin:0'>
</pre>