d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "cgal: fix gcc ≥ 6 build" 

This reverts commit 8912905d69.
This commit is contained in:
Tony Theodore 2018-08-13 18:42:18 +10:00
parent a3b84ec9c8
commit 1db1e1eb92
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/cgal.mk
View File

@ -14,7 +14,6 @@ $(PKG)_DEPS := cc boost gmp mpfr qtbase
define $(PKG)_BUILD
cd '$(BUILD_DIR)' && '$(TARGET)-cmake' '$(SOURCE_DIR)' \
-DMXE_DISABLE_INCLUDE_SYSTEM_FLAG=TRUE \
-DCGAL_INSTALL_CMAKE_DIR:STRING="lib/CGAL" \
-DCGAL_INSTALL_INC_DIR:STRING="include" \
-DCGAL_INSTALL_DOC_DIR:STRING="share/doc/CGAL-$($(PKG)_VERSION)" \
@ -28,16 +27,12 @@ define $(PKG)_BUILD
$(MAKE) -C '$(BUILD_DIR)' -j 1 install
mkdir '$(BUILD_DIR).test-tree'
cd '$(BUILD_DIR).test-tree' && '$(TARGET)-cmake' '$(SOURCE_DIR)/examples/AABB_tree' \
-DMXE_DISABLE_INCLUDE_SYSTEM_FLAG=TRUE \
-DCMAKE_CXX_STANDARD=98
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'
mkdir '$(BUILD_DIR).test-image'
cd '$(BUILD_DIR).test-image' && '$(TARGET)-cmake' '$(SOURCE_DIR)/examples/CGALimageIO' \
-DMXE_DISABLE_INCLUDE_SYSTEM_FLAG=TRUE \
-DCMAKE_CXX_STANDARD=98
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