diff options
| author | Tony Theodore <tonyt@logyst.com> | 2018-08-13 08:42:18 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2018-08-15 02:57:09 (GMT) |
| commit | 1db1e1eb92275410cf258a23165df1eefc2c6a94 (patch) | |
| tree | 69e05d49ef5ef61bcb5142caab283093bae347f6 /src/cgal.mk | |
| parent | a3b84ec9c8ec8f3d1c9183539a742930cd51201d (diff) | |
| download | mxe-1db1e1eb92275410cf258a23165df1eefc2c6a94.zip mxe-1db1e1eb92275410cf258a23165df1eefc2c6a94.tar.gz mxe-1db1e1eb92275410cf258a23165df1eefc2c6a94.tar.bz2 | |
Revert "cgal: fix gcc ≥ 6 build"
This reverts commit 8912905d690604cddb95f68fd437d5f86924713f.
Diffstat (limited to 'src/cgal.mk')
| -rw-r--r-- | src/cgal.mk | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/cgal.mk b/src/cgal.mk index d2a9a64..9bdd4ca 100644 --- a/src/cgal.mk +++ b/src/cgal.mk @@ -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 |