From 295884f5d3947a3ab11457ada5780e0970ca8eef Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Mon, 13 Aug 2018 22:14:34 +1000 Subject: [PATCH] =?UTF-8?q?cgal:=20fix=20tests=20for=20gcc=20=E2=89=A5=206?= =?UTF-8?q?=20with=20CMAKE=5FCXX=5FSTANDARD=3D98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/cgal.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/cgal.mk b/src/cgal.mk index 9bdd4ca1..23568556 100644 --- a/src/cgal.mk +++ b/src/cgal.mk @@ -27,12 +27,14 @@ 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' + cd '$(BUILD_DIR).test-tree' && '$(TARGET)-cmake' '$(SOURCE_DIR)/examples/AABB_tree' \ + -DCMAKE_CXX_STANDARD=98 $(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' + cd '$(BUILD_DIR).test-image' && '$(TARGET)-cmake' '$(SOURCE_DIR)/examples/CGALimageIO' \ + -DCMAKE_CXX_STANDARD=98 $(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