From 1db1e1eb92275410cf258a23165df1eefc2c6a94 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Mon, 13 Aug 2018 18:42:18 +1000 Subject: [PATCH] =?UTF-8?q?Revert=20"cgal:=20fix=20gcc=20=E2=89=A5=206=20b?= =?UTF-8?q?uild"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 8912905d690604cddb95f68fd437d5f86924713f. --- src/cgal.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/cgal.mk b/src/cgal.mk index d2a9a641..9bdd4ca1 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