diff options
| author | Tony Theodore <tonyt@logyst.com> | 2015-11-28 10:06:13 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2015-11-28 10:06:13 (GMT) |
| commit | 9f0dbfafc60b725dc09c85059b5b58c3298e3319 (patch) | |
| tree | 9a1f26cf8f84c940dab58bfa18eef5a78f1085ee /src/cgal.mk | |
| parent | 46baacbd2116380e67bb072730886140caf9d8d8 (diff) | |
| download | mxe-9f0dbfafc60b725dc09c85059b5b58c3298e3319.zip mxe-9f0dbfafc60b725dc09c85059b5b58c3298e3319.tar.gz mxe-9f0dbfafc60b725dc09c85059b5b58c3298e3319.tar.bz2 | |
cgal:update 4.5-->4.6.3 and enable shared
Diffstat (limited to 'src/cgal.mk')
| -rw-r--r-- | src/cgal.mk | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/src/cgal.mk b/src/cgal.mk index 6ef3e46..cae0b1c 100644 --- a/src/cgal.mk +++ b/src/cgal.mk @@ -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 = |