diff options
| author | Timothy Gu <timothygu99@gmail.com> | 2014-12-15 01:18:19 (GMT) |
|---|---|---|
| committer | Timothy Gu <timothygu99@gmail.com> | 2014-12-15 01:21:36 (GMT) |
| commit | 4f6fc9b30afd69a20b2ba2473fc6066a773c617a (patch) | |
| tree | 5568387bc518acdc0863e73dc681b948ddd1ac28 /src/cgal.mk | |
| parent | 47c3d0c170438a2694a32c3ffbaebfaeb335dbd6 (diff) | |
| download | mxe-4f6fc9b30afd69a20b2ba2473fc6066a773c617a.zip mxe-4f6fc9b30afd69a20b2ba2473fc6066a773c617a.tar.gz mxe-4f6fc9b30afd69a20b2ba2473fc6066a773c617a.tar.bz2 | |
Update cgal
Also adds a test for CGALImageIO.
Fixes #587.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Diffstat (limited to 'src/cgal.mk')
| -rw-r--r-- | src/cgal.mk | 41 |
1 files changed, 23 insertions, 18 deletions
diff --git a/src/cgal.mk b/src/cgal.mk index fe68e8a..feecd7b 100644 --- a/src/cgal.mk +++ b/src/cgal.mk @@ -3,11 +3,11 @@ PKG := cgal $(PKG)_IGNORE := -$(PKG)_VERSION := 4.0.2 -$(PKG)_CHECKSUM := 20c58ebc021754e8be35237bcda43b0084f60617 +$(PKG)_VERSION := 4.5 +$(PKG)_CHECKSUM := 97c60d3b12727b4fbbcce45a0965941bb1d60cbe $(PKG)_SUBDIR := CGAL-$($(PKG)_VERSION) $(PKG)_FILE := CGAL-$($(PKG)_VERSION).tar.xz -$(PKG)_URL := https://gforge.inria.fr/frs/download.php/31176/$($(PKG)_FILE) +$(PKG)_URL := https://gforge.inria.fr/frs/download.php/34139/$($(PKG)_FILE) $(PKG)_DEPS := gcc boost gmp mpfr qt define $(PKG)_UPDATE @@ -23,29 +23,34 @@ define $(PKG)_BUILD -DCGAL_INSTALL_INC_DIR:STRING="include" \ -DCGAL_INSTALL_DOC_DIR:STRING="share/doc/CGAL-$($(PKG)_VERSION)" \ -DCGAL_INSTALL_BIN_DIR:STRING="bin" \ - -DBOOST_LIB_DIAGNOSTIC_DEFINITIONS:STRING="-DBOOST_LIB_DIAGNOSTIC" \ - -DWITH_CGAL_Qt3:BOOL="0" \ + -DCGAL_Boost_USE_STATIC_LIBS:BOOL=OFF \ + -DWITH_CGAL_Qt3:BOOL=OFF \ + -DWITH_OpenGL:BOOL=ON \ + -DWITH_ZLIB:BOOL=ON \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ - -DBOOST_COMPILER=_win32 \ - -DBOOST_THREAD_USE_LIB=1 \ - -DBOOST_USE_STATIC_LIBS=1 \ - -DBUILD_SHARED_LIBS=0 \ - -C TryRunResults.cgal.cmake . + -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 \ - -DBOOST_LIB_DIAGNOSTIC_DEFINITIONS:STRING="-DBOOST_LIB_DIAGNOSTIC" \ - -DWITH_CGAL_Qt3:BOOL="0" \ + -DWITH_CGAL_Qt3:BOOL=OFF \ + -DCGAL_Boost_USE_STATIC_LIBS:BOOL=OFF \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ - -DBOOST_COMPILER=_win32 \ - -DBOOST_THREAD_USE_LIB=1 \ - -DBOOST_USE_STATIC_LIBS=1 \ - -DBUILD_SHARED_LIBS=0 \ + -DBUILD_SHARED_LIBS=OFF \ -DCGAL_DIR:STRING="../.." . - $(MAKE) -C '$(1)/examples/AABB_tree' -j $(JOBS) - $(MAKE) -C '$(1)' -j $(JOBS) install $(INSTALL) '$(1)/examples/AABB_tree/AABB_polyhedron_edge_example.exe' '$(PREFIX)/$(TARGET)/bin/test-cgal.exe' + + cd '$(1)/examples/CGALimageIO' && cmake \ + -DWITH_CGAL_Qt3:BOOL=OFF \ + -DCGAL_Boost_USE_STATIC_LIBS:BOOL=OFF \ + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + -DBUILD_SHARED_LIBS=OFF \ + -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 = |