summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Marvin Schmidt <marv@exherbo.org> 2017-06-22 20:58:08 +0200
committerAvatar Marvin Schmidt <marv@exherbo.org> 2017-06-22 23:04:08 +0200
commit0ce42698b0485f9723cf517ef3f28b7442a19c33 (patch)
treef12cc0fbd84f930ec28b3cd1228250760f247aae
parent1faf1fc43906a96d66e8e73cc2f6d45733c768df (diff)
downloadscientific-0ce42698b0485f9723cf517ef3f28b7442a19c33.tar.gz
scientific-0ce42698b0485f9723cf517ef3f28b7442a19c33.tar.xz
CGAL: Bump to 4.10
Change-Id: Ic5d70280ff40a1a3cc29ad21491fe6573a696e60 Reviewed-on: https://galileo.mailstation.de/gerrit/9391 Reviewed-by: Jenkins <wk@mailstation.de> Reviewed-by: Marvin Schmidt <marv@exherbo.org>
-rw-r--r--packages/sci-libs/CGAL/CGAL-4.10.exheres-0 (renamed from packages/sci-libs/CGAL/CGAL-4.7.exheres-0)15
-rw-r--r--packages/sci-libs/CGAL/files/0001-Include-GNUInstallDirs-and-use-CMAKE_INSTALL_-variab.patch67
2 files changed, 5 insertions, 77 deletions
diff --git a/packages/sci-libs/CGAL/CGAL-4.7.exheres-0 b/packages/sci-libs/CGAL/CGAL-4.10.exheres-0
index efed700..a3c1d02 100644
--- a/packages/sci-libs/CGAL/CGAL-4.7.exheres-0
+++ b/packages/sci-libs/CGAL/CGAL-4.10.exheres-0
@@ -1,4 +1,4 @@
-# Copyright 2016 Marvin Schmidt <marv@exherbo.org>
+# Copyright 2016-2017 Marvin Schmidt <marv@exherbo.org>
# Distributed under the terms of the GNU General Public License v2
MY_PN=cgal
@@ -21,7 +21,7 @@ DEPENDENCIES="
app-arch/xz
virtual/pkg-config
build+run:
- dev-libs/boost[>=1.39]
+ dev-libs/boost[>=1.48.0]
dev-libs/gmp:=
dev-libs/mpfr:=
sci-libs/eigen:3[>=3.1.0]
@@ -35,10 +35,6 @@ DEPENDENCIES="
)
"
-DEFAULT_SRC_PREPARE_PATCHES=(
- -p2 "${FILES}"/0001-Include-GNUInstallDirs-and-use-CMAKE_INSTALL_-variab.patch
-)
-
CMAKE_SRC_CONFIGURE_PARAMS=(
-DCMAKE_BUILD_TYPE:STRING='Release'
@@ -49,10 +45,9 @@ CMAKE_SRC_CONFIGURE_PARAMS=(
-DWITH_GMP:BOOL=TRUE
-DWITH_GMPXX:BOOL=TRUE
-DWITH_MPFR:BOOL=TRUE
- -DWITH_OPENGL:BOOL=TRUE
+ -DWITH_OpenGL:BOOL=TRUE
-DWITH_ZLIB:BOOL=TRUE
- -DWITH_CGAL_Qt3:BOOL=FALSE
-DWITH_demos:BOOL=FALSE
-DWITH_examples:BOOL=FALSE
@@ -60,7 +55,7 @@ CMAKE_SRC_CONFIGURE_PARAMS=(
-DWITH_LEDA:BOOL=FALSE
# unpackaged
- -DWITH_COIN3D:BOOL=FALSE
+ -DWITH_Coin3D:BOOL=FALSE
-DWITH_ESBTL:BOOL=FALSE
-DWITH_IPE:BOOL=FALSE
-DWITH_MPFI:BOOL=FALSE
@@ -69,7 +64,7 @@ CMAKE_SRC_CONFIGURE_PARAMS=(
-DWITH_RS3:BOOL=FALSE
# only used in some demos
- -DWITH_QGLVIEWER:BOOL=FALSE
+ -DWITH_QGLViewer:BOOL=FALSE
)
CMAKE_SRC_CONFIGURE_OPTION_WITHS=(
diff --git a/packages/sci-libs/CGAL/files/0001-Include-GNUInstallDirs-and-use-CMAKE_INSTALL_-variab.patch b/packages/sci-libs/CGAL/files/0001-Include-GNUInstallDirs-and-use-CMAKE_INSTALL_-variab.patch
deleted file mode 100644
index 21309f4..0000000
--- a/packages/sci-libs/CGAL/files/0001-Include-GNUInstallDirs-and-use-CMAKE_INSTALL_-variab.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 887fade6d7ae09cfbdfe01a2b8226771c230864e Mon Sep 17 00:00:00 2001
-From: Marvin Schmidt <marv@exherbo.org>
-Date: Sat, 19 Mar 2016 14:51:12 +0100
-Subject: [PATCH] Include GNUInstallDirs and use CMAKE_INSTALL_* variables
-Upstream: Yes, committed: https://github.com/CGAL/cgal/commit/887fade6d7ae09cfbdfe01a2b8226771c230864e
-
-This allows installing the architecture-independent data outside the
-prefix. This is particularly necessary on systems using a
-multi-architecture layout where architecture-dependent files live in
-/usr/${host_triple}/ and architecture-independent files in /usr/share.
----
- Installation/CMakeLists.txt | 18 ++++++++++--------
- 1 file changed, 10 insertions(+), 8 deletions(-)
-
-diff --git a/Installation/CMakeLists.txt b/Installation/CMakeLists.txt
-index be4b013..cb558ec 100644
---- a/Installation/CMakeLists.txt
-+++ b/Installation/CMakeLists.txt
-@@ -27,6 +27,8 @@ if(POLICY CMP0054)
- cmake_policy(SET CMP0054 NEW)
- endif()
-
-+# Use GNUInstallDirst to get canonical paths
-+include(GNUInstallDirs)
-
- #--------------------------------------------------------------------------------------------------
- #
-@@ -709,28 +711,28 @@ endif()
- #
- #--------------------------------------------------------------------------------------------------
-
--set ( CGAL_INSTALL_INC_DIR "include" CACHE STRING "The folder where CGAL header files will be installed, relative to CMAKE_INSTALL_PREFIX" )
--set ( CGAL_INSTALL_LIB_DIR "lib" CACHE STRING "The folder where CGAL libraries will be installed, relative to CMAKE_INSTALL_PREFIX" )
-+set ( CGAL_INSTALL_INC_DIR "${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "The folder where CGAL header files will be installed, relative to CMAKE_INSTALL_PREFIX" )
-+set ( CGAL_INSTALL_LIB_DIR "${CMAKE_INSTALL_LIBDIR}" CACHE STRING "The folder where CGAL libraries will be installed, relative to CMAKE_INSTALL_PREFIX" )
-
- if ( CGAL_WIN32_CMAKE_ON_CYGWIN )
- exec_program(cygpath ARGS -w "${CMAKE_INSTALL_PREFIX}" OUTPUT_VARIABLE CMAKE_INSTALL_PREFIX2 )
- file ( TO_CMAKE_PATH ${CMAKE_INSTALL_PREFIX2} CMAKE_INSTALL_PREFIX )
- endif()
-
--set ( CGAL_INSTALL_BIN_DIR "bin"
-- CACHE STRING "The folder where CGAL user-side scripts will be installed, relative to CMAKE_INSTALL_PREFIX"
-+set ( CGAL_INSTALL_BIN_DIR "${CMAKE_INSTALL_BINDIR}"
-+ CACHE STRING "The folder where CGAL user-side scripts will be installed, relative to CMAKE_INSTALL_PREFIX"
- )
-
- set ( CGAL_INSTALL_CMAKE_DIR "${CGAL_INSTALL_LIB_DIR}/CGAL"
- CACHE STRING "The folder where CGAL CMake modules will be installed, relative to CMAKE_INSTALL_PREFIX"
- )
-
--set ( CGAL_INSTALL_DOC_DIR "share/doc/${CGAL_VERSION_DIR}"
-- CACHE STRING "The folder where CGAL documentation and license files will be installed, relative to CMAKE_INSTALL_PREFIX"
-+set ( CGAL_INSTALL_DOC_DIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}/doc/${CGAL_VERSION_DIR}"
-+ CACHE STRING "The folder where CGAL documentation and license files will be installed, relative to CMAKE_INSTALL_PREFIX"
- )
-
--set ( CGAL_INSTALL_MAN_DIR "share/man/man1"
-- CACHE STRING "The folder where manual pages for CGAL scripts will be installed, relative to CMAKE_INSTALL_PREFIX"
-+set ( CGAL_INSTALL_MAN_DIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}/man/man1"
-+ CACHE STRING "The folder where manual pages for CGAL scripts will be installed, relative to CMAKE_INSTALL_PREFIX"
- )
-
- message("== Write compiler_config.h (DONE) ==\n")
---
-2.7.3
-