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

cgal: use new-style options and restore tests

This commit is contained in:
Tony Theodore 2017-07-26 20:28:45 +10:00
parent 45af530231
commit 52195ec782
2 changed files with 52 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/cgal-1-fixes.patch Normal file
View File

@ -0,0 +1,37 @@
This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Wed, 26 Jul 2017 18:34:16 +1000
Subject: [PATCH] link examples with boost libraries
diff --git a/cmake/modules/CGAL_CreateSingleSourceCGALProgram.cmake b/cmake/modules/CGAL_CreateSingleSourceCGALProgram.cmake
index 1111111..2222222 100644
--- a/cmake/modules/CGAL_CreateSingleSourceCGALProgram.cmake
+++ b/cmake/modules/CGAL_CreateSingleSourceCGALProgram.cmake
@@ -1,6 +1,8 @@
include(CGAL_add_test)
include(CMakeParseArguments)
+find_package(Boost COMPONENTS system thread REQUIRED)
+
function(create_single_source_cgal_program firstfile )
set(options NO_TESTING)
set(oneValueArgs)
@@ -61,11 +63,11 @@ function(create_single_source_cgal_program firstfile )
# Link the executable to CGAL and third-party libraries
if ( CGAL_AUTO_LINK_ENABLED )
- target_link_libraries(${exe_name} ${CGAL_3RD_PARTY_LIBRARIES} )
+ target_link_libraries(${exe_name} ${CGAL_3RD_PARTY_LIBRARIES} ${Boost_LIBRARIES} )
else()
- target_link_libraries(${exe_name} ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} )
+ target_link_libraries(${exe_name} ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} ${Boost_LIBRARIES} )
endif()
else()

27
src/cgal.mk
View File

@ -5,31 +5,34 @@ $(PKG)_WEBSITE := https://www.cgal.org/
$(PKG)_IGNORE :=
$(PKG)_VERSION := 4.10
$(PKG)_CHECKSUM := eb56e17dcdecddf6a6fb808931b2142f20aaa182916ddbd912273c51e0f0c045
# using / in tag name means we have to set SUBDIR, FILE, URL
$(PKG)_GH_CONF := CGAL/cgal, releases/CGAL-
$(PKG)_SUBDIR := CGAL-$($(PKG)_VERSION)
$(PKG)_FILE := CGAL-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := https://github.com/CGAL/cgal/releases/download/releases/$($(PKG)_SUBDIR)/$($(PKG)_FILE)
$(PKG)_DEPS := gcc boost gmp mpfr qt5
define $(PKG)_UPDATE
$(WGET) -q -O- 'https://gforge.inria.fr/frs/?group_id=52' | \
grep 'CGAL-' | \
$(SED) -n 's,.*CGAL-\([0-9][^>a-z]*\)\.tar.*,\1,p' | \
head -1
endef
define $(PKG)_BUILD
cd '$(1)' && '$(TARGET)-cmake' \
cd '$(BUILD_DIR)' && '$(TARGET)-cmake' '$(SOURCE_DIR)' \
-DCGAL_INSTALL_CMAKE_DIR:STRING="lib/CGAL" \
-DCGAL_INSTALL_INC_DIR:STRING="include" \
-DCGAL_INSTALL_DOC_DIR:STRING="share/doc/CGAL-$($(PKG)_VERSION)" \
-DCGAL_INSTALL_BIN_DIR:STRING="bin" \
-DCGAL_Boost_USE_STATIC_LIBS:BOOL=$(CMAKE_STATIC_BOOL) \
-DWITH_CGAL_Qt3:BOOL=OFF \
-DWITH_OpenGL:BOOL=ON \
-DWITH_ZLIB:BOOL=ON \
-C '$(PWD)/src/cgal-TryRunResults.cmake' .
-C'$(PWD)/src/cgal-TryRunResults.cmake'
$(MAKE) -C '$(1)' -j $(JOBS)
$(MAKE) -C '$(1)' -j 1 install
$(MAKE) -C '$(BUILD_DIR)' -j $(JOBS)
$(MAKE) -C '$(BUILD_DIR)' -j 1 install
mkdir '$(BUILD_DIR).test-tree'
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'
$(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