diff options
| author | Tony Theodore <tonyt@logyst.com> | 2017-07-26 11:20:44 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-26 11:20:44 (GMT) |
| commit | f7ba95fc018664fe14ecd63fd60b93bf79068182 (patch) | |
| tree | 7e1779640acde3986e6c9a67c4f6b31bd3f7dd61 /src/cgal.mk | |
| parent | 398e316829e7bbf267b0652395f364f7b70b2362 (diff) | |
| parent | 52195ec78243d4dd38d384cca191df04478342ed (diff) | |
| download | mxe-f7ba95fc018664fe14ecd63fd60b93bf79068182.zip mxe-f7ba95fc018664fe14ecd63fd60b93bf79068182.tar.gz mxe-f7ba95fc018664fe14ecd63fd60b93bf79068182.tar.bz2 | |
Merge pull request #1859 from tonytheodore/ClearCorrect-cgal_4_10
Updated cgal to 4.10.
Diffstat (limited to 'src/cgal.mk')
| -rw-r--r-- | src/cgal.mk | 46 |
1 files changed, 17 insertions, 29 deletions
diff --git a/src/cgal.mk b/src/cgal.mk index f9b6380..a1edf69 100644 --- a/src/cgal.mk +++ b/src/cgal.mk @@ -3,48 +3,36 @@ PKG := cgal $(PKG)_WEBSITE := https://www.cgal.org/ $(PKG)_IGNORE := -$(PKG)_VERSION := 4.9.1 -$(PKG)_CHECKSUM := 56557da971b5310c2678ffc5def4109266666ff3adc7babbe446797ee2b90cca +$(PKG)_VERSION := 4.10 +$(PKG)_CHECKSUM := eb56e17dcdecddf6a6fb808931b2142f20aaa182916ddbd912273c51e0f0c045 +# using / in tag name means we have to set SUBDIR, FILE, URL +$(PKG)_GH_CONF := CGAL/cgal, releases/CGAL- $(PKG)_SUBDIR := CGAL-$($(PKG)_VERSION) $(PKG)_FILE := CGAL-$($(PKG)_VERSION).tar.xz -$(PKG)_URL := https://github.com/CGAL/cgal/releases/download/releases%2F$($(PKG)_SUBDIR)/$($(PKG)_FILE) +$(PKG)_URL := https://github.com/CGAL/cgal/releases/download/releases/$($(PKG)_SUBDIR)/$($(PKG)_FILE) $(PKG)_DEPS := gcc boost gmp mpfr qt5 -define $(PKG)_UPDATE - $(WGET) -q -O- 'https://gforge.inria.fr/frs/?group_id=52' | \ - grep 'CGAL-' | \ - $(SED) -n 's,.*CGAL-\([0-9][^>a-z]*\)\.tar.*,\1,p' | \ - head -1 -endef - define $(PKG)_BUILD - cd '$(1)' && '$(TARGET)-cmake' \ + cd '$(BUILD_DIR)' && '$(TARGET)-cmake' '$(SOURCE_DIR)' \ -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=$(CMAKE_STATIC_BOOL) \ - -DWITH_CGAL_Qt3:BOOL=OFF \ -DWITH_OpenGL:BOOL=ON \ -DWITH_ZLIB:BOOL=ON \ - -C '$(PWD)/src/cgal-TryRunResults.cmake' . + -C'$(PWD)/src/cgal-TryRunResults.cmake' - $(MAKE) -C '$(1)' -j $(JOBS) - $(MAKE) -C '$(1)' -j 1 install + $(MAKE) -C '$(BUILD_DIR)' -j $(JOBS) + $(MAKE) -C '$(BUILD_DIR)' -j 1 install - cd '$(1)/examples/AABB_tree' && '$(TARGET)-cmake' \ - -DWITH_CGAL_Qt3:BOOL=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' + mkdir '$(BUILD_DIR).test-tree' + cd '$(BUILD_DIR).test-tree' && '$(TARGET)-cmake' '$(SOURCE_DIR)/examples/AABB_tree' + $(MAKE) -C '$(BUILD_DIR).test-tree' -j $(JOBS) + $(INSTALL) '$(BUILD_DIR).test-tree/AABB_polyhedron_edge_example.exe' '$(PREFIX)/$(TARGET)/bin/test-cgal.exe' - cd '$(1)/examples/CGALimageIO' && '$(TARGET)-cmake' \ - -DWITH_CGAL_Qt3:BOOL=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' + mkdir '$(BUILD_DIR).test-image' + cd '$(BUILD_DIR).test-image' && '$(TARGET)-cmake' '$(SOURCE_DIR)/examples/CGALimageIO' + $(MAKE) -C '$(BUILD_DIR).test-image' -j $(JOBS) + $(INSTALL) '$(BUILD_DIR).test-image/convert_raw_image_to_inr.exe' '$(PREFIX)/$(TARGET)/bin/test-cgalimgio.exe' endef |