From 45af530231ec2b1206b27f67389146aab28d53d1 Mon Sep 17 00:00:00 2001 From: Robert Marsa Date: Wed, 12 Jul 2017 13:38:47 -0500 Subject: [PATCH] cgal: Fixed build. --- src/cgal-TryRunResults.cmake | 15 ++++++++++++--- src/cgal.mk | 15 --------------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/src/cgal-TryRunResults.cmake b/src/cgal-TryRunResults.cmake index 9e3acf43..40667921 100644 --- a/src/cgal-TryRunResults.cmake +++ b/src/cgal-TryRunResults.cmake @@ -223,11 +223,20 @@ SET( OPENGL_RUN_RES__TRYRUN_OUTPUT CACHE STRING "Output from TRY_RUN" FORCE) -SET( QT4_RUN_RES +SET( QT_RUN_RES "0" CACHE STRING "Result from TRY_RUN" FORCE) -SET( QT4_RUN_RES__TRYRUN_OUTPUT - "version=4.8.6" +SET( QT_RUN_RES__TRYRUN_OUTPUT + "version=5.9.0" + CACHE STRING "Output from TRY_RUN" FORCE) + + +SET( CGAL_test_cpp_version_RUN_RES + "0" + CACHE STRING "Result from TRY_RUN" FORCE) + +SET( CGAL_test_cpp_version_RUN_RES__TRYRUN_OUTPUT + "201103L" CACHE STRING "Output from TRY_RUN" FORCE) diff --git a/src/cgal.mk b/src/cgal.mk index b7661011..69fc0f22 100644 --- a/src/cgal.mk +++ b/src/cgal.mk @@ -32,19 +32,4 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)' -j $(JOBS) $(MAKE) -C '$(1)' -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' - - 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' endef