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

Update cgal 

Also adds a test for CGALImageIO.

Fixes #587.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
This commit is contained in:
Timothy Gu 2014-12-14 20:18:19 -05:00
parent 47c3d0c170
commit 4f6fc9b30a
3 changed files with 275 additions and 385 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

380
src/cgal-1-fixes.patch
View File

@ -3,373 +3,25 @@ See index.html for further information.
Contains ad hoc patches for cross building.
From 06377a4e5c08eee03cb2ab244454a24499fc7231 Mon Sep 17 00:00:00 2001
From: MXE
Date: Fri, 21 Oct 2011 23:08:52 +0200
Subject: [PATCH 1/5] adjustments for mingw-cross-env
From 211217324f551479c15cdf77bac6c397112f3b3d Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Subject: [PATCH] Fix GCC detection
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index af8be68..61a5ee7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -400,6 +400,8 @@ message( STATUS "System: ${CMAKE_SYSTEM_NAME}" )
#
#--------------------------------------------------------------------------------------------------
diff --git a/include/CGAL/sse2.h b/include/CGAL/sse2.h
index acc7ece..3e8394d 100644
--- a/include/CGAL/sse2.h
+++ b/include/CGAL/sse2.h
@@ -29,7 +29,7 @@
+uniquely_add_flags( CXXFLAGS "-DBOOST_THREAD_USE_LIB;-DBoost_USE_STATIC_LIBS" )
+SET(CMAKE_CXX_FLAGS_RELEASE "-DBOOST_THREAD_USE_LIB -DBoost_USE_STATIC_LIBS -O3 -DNDEBUG" CACHE STRING blah FORCE)
if( MSVC )
uniquely_add_flags ( CGAL_CXX_FLAGS "-D_CRT_SECURE_NO_DEPRECATE;-D_SCL_SECURE_NO_DEPRECATE;-D_CRT_SECURE_NO_WARNINGS;-D_SCL_SECURE_NO_WARNINGS" )
diff --git a/TryRunResults.cgal.cmake b/TryRunResults.cgal.cmake
new file mode 100644
index 0000000..299de90
--- /dev/null
+++ b/TryRunResults.cgal.cmake
@@ -0,0 +1,198 @@
+SET( GCC_RUN_RES
+ 0
+ CACHE STRING "version=4.7.0" FORCE)
+SET( GCC_RUN_RES__TRYRUN_OUTPUT
+ 0
+ CACHE STRING "version=4.7.0" FORCE)
+SET( GMP_RUN_RES
+ 0
+ CACHE STRING "version=5.0.2" FORCE)
+SET( GMP_RUN_RES__TRYRUN_OUTPUT
+ 0
+ CACHE STRING "version=5.0.2" FORCE)
+SET( MPFR_RUN_RES
+ 0
+ CACHE STRING "version=3.1.0" FORCE)
+SET( MPFR_RUN_RES__TRYRUN_OUTPUT
+ 0
+ CACHE STRING "version=3.1.0" FORCE)
+SET( CGAL_CFG_ARRAY_MEMBER_INITIALIZATION_BUG
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_ARRAY_MEMBER_INITIALIZATION_BUG__TRYRUN_OUTPUT
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_DENORMALS_COMPILE_BUG
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_DENORMALS_COMPILE_BUG__TRYRUN_OUTPUT
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_FPU_ROUNDING_MODE_UNWINDING_VC_BUG
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_FPU_ROUNDING_MODE_UNWINDING_VC_BUG__TRYRUN_OUTPUT
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_IEEE_754_BUG
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_IEEE_754_BUG__TRYRUN_OUTPUT
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_ISTREAM_INT_BUG
+ 0
+ CACHE STRING "7812" FORCE)
+SET( CGAL_CFG_ISTREAM_INT_BUG__TRYRUN_OUTPUT
+ 0
+ CACHE STRING "7812" FORCE)
+SET( CGAL_CFG_LONGNAME_BUG
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_LONGNAME_BUG__TRYRUN_OUTPUT
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_MATCHING_BUG_5
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_MATCHING_BUG_5__TRYRUN_OUTPUT
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_MATCHING_BUG_6
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_MATCHING_BUG_6__TRYRUN_OUTPUT
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NESTED_CLASS_FRIEND_DECLARATION_BUG
+ 0
+ CACHE STRING "A's do_something\nC's do_something\nB's do_something\nC's do_something" FORCE)
+SET( CGAL_CFG_NESTED_CLASS_FRIEND_DECLARATION_BUG__TRYRUN_OUTPUT
+ 0
+ CACHE STRING "A's do_something\nC's do_something\nB's do_something\nC's do_something" FORCE)
+SET( CGAL_CFG_NO_CPP0X_DELETED_AND_DEFAULT_FUNCTIONS
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_CPP0X_DELETED_AND_DEFAULT_FUNCTIONS__TRYRUN_OUTPUT
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_CPP0X_ISFINITE
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_CPP0X_ISFINITE__TRYRUN_OUTPUT
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_CPP0X_LONG_LONG
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_CPP0X_LONG_LONG__TRYRUN_OUTPUT
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_CPP0X_DELEGATING_CONSTRUCTORS
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_CPP0X_DELEGATING_CONSTRUCTORS__TRYRUN_OUTPUT
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_LIMITS
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_LIMITS__TRYRUN_OUTPUT
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_LOGICAL_OPERATORS_ALTERNATIVES
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_LOGICAL_OPERATORS_ALTERNATIVES__TRYRUN_OUTPUT
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_MESSAGE_PRAGMA_BUG
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_MESSAGE_PRAGMA_BUG__TRYRUN_OUTPUT
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_NEXTAFTER
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_NEXTAFTER__TRYRUN_OUTPUT
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_STATEMENT_EXPRESSIONS
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_STATEMENT_EXPRESSIONS__TRYRUN_OUTPUT
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_STL
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_STL__TRYRUN_OUTPUT
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_TMPL_IN_TMPL_PARAM
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_TMPL_IN_TMPL_PARAM__TRYRUN_OUTPUT
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_TR1_ARRAY
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_TR1_ARRAY__TRYRUN_OUTPUT
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_TR1_TUPLE
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_TR1_TUPLE__TRYRUN_OUTPUT
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_WARNING_CPP_DIRECTIVE_BUG
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NO_WARNING_CPP_DIRECTIVE_BUG__TRYRUN_OUTPUT
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NUMERIC_LIMITS_BUG
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_NUMERIC_LIMITS_BUG__TRYRUN_OUTPUT
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_OUTOFLINE_MEMBER_DEFINITION_BUG
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_OUTOFLINE_MEMBER_DEFINITION_BUG__TRYRUN_OUTPUT
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_TEMPLATE_IN_DEFAULT_PARAMETER_BUG
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_TEMPLATE_IN_DEFAULT_PARAMETER_BUG__TRYRUN_OUTPUT
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_TYPENAME_BEFORE_DEFAULT_ARGUMENT_BUG
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_TYPENAME_BEFORE_DEFAULT_ARGUMENT_BUG__TRYRUN_OUTPUT
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_USING_BASE_MEMBER_BUG_2
+ 0
+ CACHE STRING " " FORCE)
+SET( CGAL_CFG_USING_BASE_MEMBER_BUG_2__TRYRUN_OUTPUT
+ 0
+ CACHE STRING " " FORCE)
+SET( ZLIB_RUN_RES
+ 0
+ CACHE STRING "version=1.2.5" FORCE)
+SET( ZLIB_RUN_RES__TRYRUN_OUTPUT
+ 0
+ CACHE STRING "version=1.2.5" FORCE)
+SET( QT4_RUN_RES
+ 0
+ CACHE STRING "version=4.8.0" FORCE)
+SET( QT4_RUN_RES__TRYRUN_OUTPUT
+ 0
+ CACHE STRING "version=4.8.0" FORCE)
diff --git a/cmake/modules/FindBoost.cmake b/cmake/modules/FindBoost.cmake
index fbdde88..5d8a0a9 100644
--- a/cmake/modules/FindBoost.cmake
+++ b/cmake/modules/FindBoost.cmake
@@ -167,6 +167,7 @@
#
include( CGAL_VersionUtils )
+set(Boost_USE_STATIC_LIBS ON)
#-------------------------------------------------------------------------------
@@ -706,7 +707,9 @@ ELSE (_boost_IN_CACHE)
ENDIF( Boost_USE_STATIC_LIBS )
# Find libraries (search in user defined directories first)
+ SET ( _boost_COMPILER "_win32")
SET ( _boost_${UPPERCOMPONENT}_LIBRARY_RELEASE_NAMES
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}
${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_STATIC_TAG}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}-${Boost_LIB_VERSION}
diff --git a/include/CGAL/Constrained_Delaunay_triangulation_2.h b/include/CGAL/Constrained_Delaunay_triangulation_2.h
index c89e7f7..57a5d40 100644
--- a/include/CGAL/Constrained_Delaunay_triangulation_2.h
+++ b/include/CGAL/Constrained_Delaunay_triangulation_2.h
@@ -390,7 +390,7 @@ is_flipable(Face_handle f, int i, bool perturb) const
Face_handle ni = f->neighbor(i);
if (is_infinite(f) || is_infinite(ni)) return false;
if (f->is_constrained(i)) return false;
- return (side_of_oriented_circle(ni, f->vertex(i)->point(), perturb)
+ return (this->side_of_oriented_circle(ni, f->vertex(i)->point(), perturb)
== ON_POSITIVE_SIDE);
}
@@ -494,7 +494,7 @@ test_conflict(const Point& p, Face_handle fh) const
// return true if P is inside the circumcircle of fh
// if fh is infinite, return true when p is in the positive
// halfspace or on the boundary and in the finite edge of fh
- Oriented_side os = side_of_oriented_circle(fh,p,true);
+ Oriented_side os = this->side_of_oriented_circle(fh,p,true);
if (os == ON_POSITIVE_SIDE) return true;
if (os == ON_ORIENTED_BOUNDARY && is_infinite(fh)) {
--
1.8.2.2
From fc63de416f0922286a4d381124ea99e067cccf08 Mon Sep 17 00:00:00 2001
From: MXE
Date: Fri, 18 Nov 2011 00:08:25 +0100
Subject: [PATCH 2/5] prevent Qt's moc from choking on BOOST_JOIN
Taken from:
https://lists-sop.inria.fr/sympa/arc/cgal-discuss/2011-11/msg00087.html
diff --git a/cmake/modules/CGAL_Macros.cmake b/cmake/modules/CGAL_Macros.cmake
index 62d0485..852fcc9 100644
--- a/cmake/modules/CGAL_Macros.cmake
+++ b/cmake/modules/CGAL_Macros.cmake
@@ -174,9 +174,9 @@ if( NOT CGAL_MACROS_FILE_INCLUDED )
if ( ${LIB}_RUN_RES EQUAL "0" )
string( REGEX MATCH "version=.*\$" ${LIB}_VERSION_LINE ${${LIB}_OUTPUT} )
- string( REPLACE "\n" "" ${LIB}_VERSION_LINE2 ${${LIB}_VERSION_LINE} )
- string( REPLACE "\r" "" ${LIB}_VERSION_LINE3 ${${LIB}_VERSION_LINE2} )
- string( REPLACE "version=" "" ${LIB}_VERSION ${${LIB}_VERSION_LINE3} )
+ string( REPLACE "\n" "" "${LIB}_VERSION_LINE2" "${${LIB}_VERSION_LINE}" )
+ string( REPLACE "\r" "" "${LIB}_VERSION_LINE3" "${${LIB}_VERSION_LINE2}" )
+ string( REPLACE "version=" "" "${LIB}_VERSION" "${${LIB}_VERSION_LINE3}" )
else()
--
1.8.2.2
From 34f21d7bc2d213b0fb326e5214d19179f9ff8261 Mon Sep 17 00:00:00 2001
From: MXE
Date: Fri, 6 Jul 2012 09:27:49 +0200
Subject: [PATCH 3/5] update "detected" Qt version
diff --git a/TryRunResults.cgal.cmake b/TryRunResults.cgal.cmake
index 299de90..f11ddc6 100644
--- a/TryRunResults.cgal.cmake
+++ b/TryRunResults.cgal.cmake
@@ -192,7 +192,7 @@ SET( ZLIB_RUN_RES__TRYRUN_OUTPUT
CACHE STRING "version=1.2.5" FORCE)
SET( QT4_RUN_RES
0
- CACHE STRING "version=4.8.0" FORCE)
+ CACHE STRING "version=4.8.2" FORCE)
SET( QT4_RUN_RES__TRYRUN_OUTPUT
0
- CACHE STRING "version=4.8.0" FORCE)
+ CACHE STRING "version=4.8.2" FORCE)
--
1.8.2.2
From 79a8541a6782e3909573a50b25b34f999b14ca18 Mon Sep 17 00:00:00 2001
From: MXE
Date: Wed, 18 Jul 2012 00:43:17 +0200
Subject: [PATCH 4/5] boost 1.50 compatibility
diff --git a/cmake/modules/CGAL_SetupBoost.cmake b/cmake/modules/CGAL_SetupBoost.cmake
index fc3dc11..d72074fd 100644
--- a/cmake/modules/CGAL_SetupBoost.cmake
+++ b/cmake/modules/CGAL_SetupBoost.cmake
@@ -3,7 +3,7 @@ if ( NOT CGAL_Boost_Setup )
include(CGAL_TweakFindBoost)
# In the documentation, we say we require Boost-1.39, but technically we
# require 1.33.1. Some packages may require more recent versions, though.
- find_package( Boost 1.33.1 REQUIRED thread )
+ find_package( Boost 1.33.1 REQUIRED thread system chrono )
message( STATUS "Boost include: ${Boost_INCLUDE_DIRS}" )
message( STATUS "Boost libraries: ${Boost_LIBRARIES}" )
--
1.8.2.2
From b242f346ec427d3d1d9fac5e65ab8c1842993a5c Mon Sep 17 00:00:00 2001
From: MXE
Date: Thu, 23 May 2013 21:18:27 +1000
Subject: [PATCH 5/5] fix for mingw-w64 include
diff --git a/include/CGAL/FPU.h b/include/CGAL/FPU.h
index 688216f..3b28451 100644
--- a/include/CGAL/FPU.h
+++ b/include/CGAL/FPU.h
@@ -24,6 +24,9 @@
#ifndef CGAL_FPU_H
#define CGAL_FPU_H
+#ifdef __MINGW64__
+#include <windows.h>
+#endif
#include <CGAL/number_type_basic.h>
#if defined ( _MSC_VER )
#define CGAL_ALIGN_16 __declspec(align(16))
-#elif defined( __GNU__ )
+#elif defined( __GNUC__ )
#define CGAL_ALIGN_16 __attribute__((aligned(16)))
#endif
--
1.8.2.2
1.9.1

233
src/cgal-TryRunResults.cmake Normal file
View File

@ -0,0 +1,233 @@
# This file was generated by CMake because it detected TRY_RUN() commands
# in crosscompiling mode. It will be overwritten by the next CMake run.
# Copy it to a safe location, set the variables to appropriate values
# and use it then to preset the CMake cache (using -C).
SET( GCC_RUN_RES
"0"
CACHE STRING "Result from TRY_RUN" FORCE)
SET( GCC_RUN_RES__TRYRUN_OUTPUT
"version=4.9.2"
CACHE STRING "Output from TRY_RUN" FORCE)
SET( GMP_RUN_RES
"1"
CACHE STRING "Result from TRY_RUN" FORCE)
SET( GMP_RUN_RES__TRYRUN_OUTPUT
"version=6.0.0"
CACHE STRING "Output from TRY_RUN" FORCE)
SET( MPFR_RUN_RES
"0"
CACHE STRING "Result from TRY_RUN" FORCE)
SET( MPFR_RUN_RES__TRYRUN_OUTPUT
"version=3.1.2"
CACHE STRING "Output from TRY_RUN" FORCE)
SET( CGAL_CFG_BOOST_VARIANT_SWAP_BUG
"0"
CACHE STRING "Result from TRY_RUN" FORCE)
SET( CGAL_CFG_BOOST_VARIANT_SWAP_BUG__TRYRUN_OUTPUT
""
CACHE STRING "Output from TRY_RUN" FORCE)
SET( CGAL_CFG_DENORMALS_COMPILE_BUG
"0"
CACHE STRING "Result from TRY_RUN" FORCE)
SET( CGAL_CFG_DENORMALS_COMPILE_BUG__TRYRUN_OUTPUT
""
CACHE STRING "Output from TRY_RUN" FORCE)
SET( CGAL_CFG_FPU_ROUNDING_MODE_UNWINDING_VC_BUG
"0"
CACHE STRING "Result from TRY_RUN" FORCE)
SET( CGAL_CFG_FPU_ROUNDING_MODE_UNWINDING_VC_BUG__TRYRUN_OUTPUT
""
CACHE STRING "Output from TRY_RUN" FORCE)
SET( CGAL_CFG_IEEE_754_BUG
"0"
CACHE STRING "Result from TRY_RUN" FORCE)
SET( CGAL_CFG_IEEE_754_BUG__TRYRUN_OUTPUT
""
CACHE STRING "Output from TRY_RUN" FORCE)
SET( CGAL_CFG_ISTREAM_INT_BUG
"0"
CACHE STRING "Result from TRY_RUN" FORCE)
SET( CGAL_CFG_ISTREAM_INT_BUG__TRYRUN_OUTPUT
"7812"
CACHE STRING "Output from TRY_RUN" FORCE)
SET( CGAL_CFG_MATCHING_BUG_5
"0"
CACHE STRING "Result from TRY_RUN" FORCE)
SET( CGAL_CFG_MATCHING_BUG_5__TRYRUN_OUTPUT
""
CACHE STRING "Output from TRY_RUN" FORCE)
SET( CGAL_CFG_MATCHING_BUG_6
"0"
CACHE STRING "Result from TRY_RUN" FORCE)
SET( CGAL_CFG_MATCHING_BUG_6__TRYRUN_OUTPUT
""
CACHE STRING "Output from TRY_RUN" FORCE)
SET( CGAL_CFG_MATCHING_BUG_7
"0"
CACHE STRING "Result from TRY_RUN" FORCE)
SET( CGAL_CFG_MATCHING_BUG_7__TRYRUN_OUTPUT
""
CACHE STRING "Output from TRY_RUN" FORCE)
SET( CGAL_CFG_MATCHING_BUG_8
"0"
CACHE STRING "Result from TRY_RUN" FORCE)
SET( CGAL_CFG_MATCHING_BUG_8__TRYRUN_OUTPUT
""
CACHE STRING "Output from TRY_RUN" FORCE)
SET( CGAL_CFG_NESTED_CLASS_FRIEND_DECLARATION_BUG
"0"
CACHE STRING "Result from TRY_RUN" FORCE)
#SET( CGAL_CFG_NESTED_CLASS_FRIEND_DECLARATION_BUG__TRYRUN_OUTPUT
# "A's do_something\nC's do_something\nB's do_something\nC's do_something"
# CACHE STRING "Output from TRY_RUN" FORCE)
SET( CGAL_CFG_NESTED_CLASS_FRIEND_DECLARATION_BUG__TRYRUN_OUTPUT
""
CACHE STRING "Output from TRY_RUN" FORCE)
SET( CGAL_CFG_NO_LIMITS
"0"
CACHE STRING "Result from TRY_RUN" FORCE)
SET( CGAL_CFG_NO_LIMITS__TRYRUN_OUTPUT
""
CACHE STRING "Output from TRY_RUN" FORCE)
SET( CGAL_CFG_NO_NEXTAFTER
"0"
CACHE STRING "Result from TRY_RUN" FORCE)
SET( CGAL_CFG_NO_NEXTAFTER__TRYRUN_OUTPUT
""
CACHE STRING "Output from TRY_RUN" FORCE)
SET( CGAL_CFG_NO_STL
"0"
CACHE STRING "Result from TRY_RUN" FORCE)
SET( CGAL_CFG_NO_STL__TRYRUN_OUTPUT
""
CACHE STRING "Output from TRY_RUN" FORCE)
SET( CGAL_CFG_NO_WARNING_CPP_DIRECTIVE_BUG
"0"
CACHE STRING "Result from TRY_RUN" FORCE)
SET( CGAL_CFG_NO_WARNING_CPP_DIRECTIVE_BUG__TRYRUN_OUTPUT
""
CACHE STRING "Output from TRY_RUN" FORCE)
SET( CGAL_CFG_NUMERIC_LIMITS_BUG
"0"
CACHE STRING "Result from TRY_RUN" FORCE)
SET( CGAL_CFG_NUMERIC_LIMITS_BUG__TRYRUN_OUTPUT
""
CACHE STRING "Output from TRY_RUN" FORCE)
SET( CGAL_CFG_OUTOFLINE_MEMBER_DEFINITION_BUG
"0"
CACHE STRING "Result from TRY_RUN" FORCE)
SET( CGAL_CFG_OUTOFLINE_MEMBER_DEFINITION_BUG__TRYRUN_OUTPUT
""
CACHE STRING "Output from TRY_RUN" FORCE)
SET( CGAL_CFG_TEMPLATE_IN_DEFAULT_PARAMETER_BUG
"0"
CACHE STRING "Result from TRY_RUN" FORCE)
SET( CGAL_CFG_TEMPLATE_IN_DEFAULT_PARAMETER_BUG__TRYRUN_OUTPUT
""
CACHE STRING "Output from TRY_RUN" FORCE)
SET( CGAL_CFG_TYPENAME_BEFORE_DEFAULT_ARGUMENT_BUG
"0"
CACHE STRING "Result from TRY_RUN" FORCE)
SET( CGAL_CFG_TYPENAME_BEFORE_DEFAULT_ARGUMENT_BUG__TRYRUN_OUTPUT
""
CACHE STRING "Output from TRY_RUN" FORCE)
SET( CGAL_CFG_USING_BASE_MEMBER_BUG_2
"0"
CACHE STRING "Result from TRY_RUN" FORCE)
SET( CGAL_CFG_USING_BASE_MEMBER_BUG_2__TRYRUN_OUTPUT
""
CACHE STRING "Output from TRY_RUN" FORCE)
SET( ZLIB_RUN_RES
"0"
CACHE STRING "Result from TRY_RUN" FORCE)
SET( ZLIB_RUN_RES__TRYRUN_OUTPUT
"version=1.2.8"
CACHE STRING "Output from TRY_RUN" FORCE)
SET( OPENGL_RUN_RES
"0"
CACHE STRING "Result from TRY_RUN" FORCE)
SET( OPENGL_RUN_RES__TRYRUN_OUTPUT
"version=1.1"
CACHE STRING "Output from TRY_RUN" FORCE)
SET( QT4_RUN_RES
"0"
CACHE STRING "Result from TRY_RUN" FORCE)
SET( QT4_RUN_RES__TRYRUN_OUTPUT
"version=4.8.6"
CACHE STRING "Output from TRY_RUN" FORCE)

47
src/cgal.mk
View File

@ -3,11 +3,11 @@
PKG := cgal
$(PKG)_IGNORE :=
$(PKG)_VERSION := 4.0.2
$(PKG)_CHECKSUM := 20c58ebc021754e8be35237bcda43b0084f60617
$(PKG)_VERSION := 4.5
$(PKG)_CHECKSUM := 97c60d3b12727b4fbbcce45a0965941bb1d60cbe
$(PKG)_SUBDIR := CGAL-$($(PKG)_VERSION)
$(PKG)_FILE := CGAL-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := https://gforge.inria.fr/frs/download.php/31176/$($(PKG)_FILE)
$(PKG)_URL := https://gforge.inria.fr/frs/download.php/34139/$($(PKG)_FILE)
$(PKG)_DEPS := gcc boost gmp mpfr qt
define $(PKG)_UPDATE
@ -23,29 +23,34 @@ define $(PKG)_BUILD
-DCGAL_INSTALL_INC_DIR:STRING="include" \
-DCGAL_INSTALL_DOC_DIR:STRING="share/doc/CGAL-$($(PKG)_VERSION)" \
-DCGAL_INSTALL_BIN_DIR:STRING="bin" \
-DBOOST_LIB_DIAGNOSTIC_DEFINITIONS:STRING="-DBOOST_LIB_DIAGNOSTIC" \
-DWITH_CGAL_Qt3:BOOL="0" \
-DCGAL_Boost_USE_STATIC_LIBS:BOOL=OFF \
-DWITH_CGAL_Qt3:BOOL=OFF \
-DWITH_OpenGL:BOOL=ON \
-DWITH_ZLIB:BOOL=ON \
-DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
-DBOOST_COMPILER=_win32 \
-DBOOST_THREAD_USE_LIB=1 \
-DBOOST_USE_STATIC_LIBS=1 \
-DBUILD_SHARED_LIBS=0 \
-C TryRunResults.cgal.cmake .
-DBUILD_SHARED_LIBS=OFF \
-C '$(PWD)/src/cgal-TryRunResults.cmake' .
$(MAKE) -C '$(1)' -j $(JOBS)
cd '$(1)/examples/AABB_tree' && cmake \
-DBOOST_LIB_DIAGNOSTIC_DEFINITIONS:STRING="-DBOOST_LIB_DIAGNOSTIC" \
-DWITH_CGAL_Qt3:BOOL="0" \
-DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
-DBOOST_COMPILER=_win32 \
-DBOOST_THREAD_USE_LIB=1 \
-DBOOST_USE_STATIC_LIBS=1 \
-DBUILD_SHARED_LIBS=0 \
-DCGAL_DIR:STRING="../.." .
$(MAKE) -C '$(1)/examples/AABB_tree' -j $(JOBS)
$(MAKE) -C '$(1)' -j $(JOBS) install
cd '$(1)/examples/AABB_tree' && cmake \
-DWITH_CGAL_Qt3:BOOL=OFF \
-DCGAL_Boost_USE_STATIC_LIBS:BOOL=OFF \
-DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
-DBUILD_SHARED_LIBS=OFF \
-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' && cmake \
-DWITH_CGAL_Qt3:BOOL=OFF \
-DCGAL_Boost_USE_STATIC_LIBS:BOOL=OFF \
-DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
-DBUILD_SHARED_LIBS=OFF \
-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
$(PKG)_BUILD_SHARED =