diff options
| author | Loïc Bartoletti <lbartoletti@FreeBSD.org> | 2020-05-08 05:35:11 +0000 |
|---|---|---|
| committer | Loïc Bartoletti <lbartoletti@FreeBSD.org> | 2020-05-08 05:35:11 +0000 |
| commit | be7d93cd66b4ef5c0010642618cf28be0ac81361 (patch) | |
| tree | 1273d892c174cbd1f65aabf35fab1208cd673c53 /databases/sfcgal | |
| parent | 6f1a28bc03892b3c094cb8d98898cea18cfa4e80 (diff) | |
| download | ports-be7d93cd66b4ef5c0010642618cf28be0ac81361.tar.gz ports-be7d93cd66b4ef5c0010642618cf28be0ac81361.zip | |
Notes
Diffstat (limited to 'databases/sfcgal')
| -rw-r--r-- | databases/sfcgal/Makefile | 8 | ||||
| -rw-r--r-- | databases/sfcgal/files/patch-CMakeLists.txt | 24 | ||||
| -rw-r--r-- | databases/sfcgal/files/patch-src_CMakeLists.txt | 13 | ||||
| -rw-r--r-- | databases/sfcgal/files/patch-src_config.h.cmake | 10 |
4 files changed, 51 insertions, 4 deletions
diff --git a/databases/sfcgal/Makefile b/databases/sfcgal/Makefile index 4d8b413e1cfc..17200c041b67 100644 --- a/databases/sfcgal/Makefile +++ b/databases/sfcgal/Makefile @@ -4,7 +4,7 @@ PORTNAME= sfcgal DISTVERSIONPREFIX= v DISTVERSION= 1.3.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases math graphics MAINTAINER= lbartoletti@FreeBSD.org @@ -13,12 +13,12 @@ COMMENT= Wrapper library around CGAL for PostGIS LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libCGAL.so:math/cgal \ - libboost_system.so:devel/boost-libs \ +BUILD_DEPENDS= cgal>0:math/cgal +LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libgmp.so:math/gmp \ libmpfr.so:math/mpfr -USES= cmake compiler:c++0x libtool +USES= cmake compiler:c++14-lang libtool USE_GITHUB= yes GH_ACCOUNT= Oslandia GH_PROJECT= SFCGAL diff --git a/databases/sfcgal/files/patch-CMakeLists.txt b/databases/sfcgal/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..e67d4cd393a5 --- /dev/null +++ b/databases/sfcgal/files/patch-CMakeLists.txt @@ -0,0 +1,24 @@ +--- CMakeLists.txt.orig 2019-06-03 10:11:36 UTC ++++ CMakeLists.txt +@@ -2,6 +2,7 @@ cmake_minimum_required( VERSION 2.8 ) + project( SFCGAL ) + + set( CMAKE_DEBUG_POSTFIX "d" ) ++set(CMAKE_CXX_STANDARD 14) + + #---------------------------------------------------------------------------- + # build options +@@ -56,8 +57,12 @@ endif() + + # 4.3 minimal + # 4.13 recommended +-find_package( CGAL 4.3 COMPONENTS Core REQUIRED ) ++find_package( CGAL COMPONENTS Core REQUIRED ) + message( STATUS "CGAL ${CGAL_VERSION} found" ) ++ ++if( "${CGAL_VERSION}" VERSION_GREATER_EQUAL "5.0.0") ++add_definitions( "-DCGAL_USE_GMPXX=1" ) ++endif() + + include_directories( ${CMAKE_BINARY_DIR}/include ) + diff --git a/databases/sfcgal/files/patch-src_CMakeLists.txt b/databases/sfcgal/files/patch-src_CMakeLists.txt new file mode 100644 index 000000000000..6714cabb73c7 --- /dev/null +++ b/databases/sfcgal/files/patch-src_CMakeLists.txt @@ -0,0 +1,13 @@ +--- src/CMakeLists.txt.orig 2019-06-03 10:11:36 UTC ++++ src/CMakeLists.txt +@@ -47,6 +47,10 @@ set_target_properties( SFCGAL PROPERTIES VERSION ${SFC + + target_link_libraries( SFCGAL CGAL::CGAL CGAL::CGAL_Core) + ++if( "${CGAL_VERSION}" VERSION_GREATER_EQUAL "5.0.0") ++target_link_libraries( SFCGAL gmpxx ) ++endif() ++ + target_link_libraries( SFCGAL ${Boost_LIBRARIES} ) + + if ( ${Use_precompiled_headers} ) diff --git a/databases/sfcgal/files/patch-src_config.h.cmake b/databases/sfcgal/files/patch-src_config.h.cmake new file mode 100644 index 000000000000..f07d2880e03d --- /dev/null +++ b/databases/sfcgal/files/patch-src_config.h.cmake @@ -0,0 +1,10 @@ +--- src/config.h.cmake.orig 2019-06-03 10:11:36 UTC ++++ src/config.h.cmake +@@ -21,7 +21,6 @@ + #define _SFCGAL_CONFIG_H_ + + #define CGAL_DO_NOT_USE_BOOST_MP 1 +-#define CGAL_DO_NOT_USE_GMPXX 1 + + #include <SFCGAL/export.h> + |