cgal:update 4.5-->4.6.3 and enable shared

pull/1016/head
Tony Theodore 9 years ago
parent 46baacbd21
commit 9f0dbfafc6

@ -1,27 +0,0 @@
This file is part of MXE.
See index.html for further information.
Contains ad hoc patches for cross building.
From 211217324f551479c15cdf77bac6c397112f3b3d Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Subject: [PATCH] Fix GCC detection
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
diff --git a/include/CGAL/sse2.h b/include/CGAL/sse2.h
index acc7ece..3e8394d 100644
--- a/include/CGAL/sse2.h
+++ b/include/CGAL/sse2.h
@@ -29,7 +29,7 @@
#if defined ( _MSC_VER )
#define CGAL_ALIGN_16 __declspec(align(16))
-#elif defined( __GNU__ )
+#elif defined( __GNUC__ )
#define CGAL_ALIGN_16 __attribute__((aligned(16)))
#endif
--
1.9.1

@ -3,11 +3,11 @@
PKG := cgal
$(PKG)_IGNORE :=
$(PKG)_VERSION := 4.5
$(PKG)_CHECKSUM := 799e8bb275033fbd6a7af015a178bc3371cb81b166e58669029ac0eb8b6e5003
$(PKG)_VERSION := 4.6.3
$(PKG)_CHECKSUM := e338027b8767c0a7a6e4fd8679182d1b83b5b1a0da0a1fe4546e7c0ca094fc21
$(PKG)_SUBDIR := CGAL-$($(PKG)_VERSION)
$(PKG)_FILE := CGAL-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := https://gforge.inria.fr/frs/download.php/34139/$($(PKG)_FILE)
$(PKG)_URL := https://gforge.inria.fr/frs/download.php/latestfile/2743/$($(PKG)_FILE)
$(PKG)_DEPS := gcc boost gmp mpfr qt
define $(PKG)_UPDATE
@ -18,39 +18,34 @@ define $(PKG)_UPDATE
endef
define $(PKG)_BUILD
cd '$(1)' && cmake \
cd '$(1)' && '$(TARGET)-cmake' \
-DCGAL_INSTALL_CMAKE_DIR:STRING="lib/CGAL" \
-DCGAL_INSTALL_INC_DIR:STRING="include" \
-DCGAL_INSTALL_DOC_DIR:STRING="share/doc/CGAL-$($(PKG)_VERSION)" \
-DCGAL_INSTALL_BIN_DIR:STRING="bin" \
-DCGAL_Boost_USE_STATIC_LIBS:BOOL=OFF \
-DCGAL_BUILD_SHARED_LIBS=$(CMAKE_SHARED_BOOL) \
-DCGAL_Boost_USE_STATIC_LIBS:BOOL=$(CMAKE_STATIC_BOOL) \
-DWITH_CGAL_Qt3:BOOL=OFF \
-DWITH_OpenGL:BOOL=ON \
-DWITH_ZLIB:BOOL=ON \
-DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
-DBUILD_SHARED_LIBS=OFF \
-C '$(PWD)/src/cgal-TryRunResults.cmake' .
$(MAKE) -C '$(1)' -j $(JOBS)
$(MAKE) -C '$(1)' -j $(JOBS) install
cd '$(1)/examples/AABB_tree' && cmake \
cd '$(1)/examples/AABB_tree' && '$(TARGET)-cmake' \
-DWITH_CGAL_Qt3:BOOL=OFF \
-DCGAL_Boost_USE_STATIC_LIBS:BOOL=OFF \
-DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
-DBUILD_SHARED_LIBS=OFF \
-DCGAL_BUILD_SHARED_LIBS=$(CMAKE_SHARED_BOOL) \
-DCGAL_Boost_USE_STATIC_LIBS:BOOL=$(CMAKE_STATIC_BOOL) \
-DCGAL_DIR:STRING="../.." .
$(MAKE) -C '$(1)/examples/AABB_tree' -j $(JOBS)
$(INSTALL) '$(1)/examples/AABB_tree/AABB_polyhedron_edge_example.exe' '$(PREFIX)/$(TARGET)/bin/test-cgal.exe'
cd '$(1)/examples/CGALimageIO' && cmake \
cd '$(1)/examples/CGALimageIO' && '$(TARGET)-cmake' \
-DWITH_CGAL_Qt3:BOOL=OFF \
-DCGAL_Boost_USE_STATIC_LIBS:BOOL=OFF \
-DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
-DBUILD_SHARED_LIBS=OFF \
-DCGAL_BUILD_SHARED_LIBS=$(CMAKE_SHARED_BOOL) \
-DCGAL_Boost_USE_STATIC_LIBS:BOOL=$(CMAKE_STATIC_BOOL) \
-DCGAL_DIR:STRING="../.." .
$(MAKE) -C '$(1)/examples/CGALimageIO' -j $(JOBS)
$(INSTALL) '$(1)/examples/CGALimageIO/convert_raw_image_to_inr.exe' '$(PREFIX)/$(TARGET)/bin/test-cgalimgio.exe'
endef
$(PKG)_BUILD_SHARED =

Loading…
Cancel
Save