Mercurial > mxe-octave
annotate src/cgal-1-fixes.patch @ 3789:08eb76a22fa0
Update README.html for NSIS installer (bug #44215).
* installer-files/README.html: Add a little more text to README. Wrap long
lines to less than 80 chars.
author | Rik <rik@octave.org> |
---|---|
date | Sat, 14 Feb 2015 21:22:13 -0800 |
parents | 3a195a5d439b |
children | 5b3f762006d3 |
rev | line source |
---|---|
2333
f653602a0500
Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents:
2332
diff
changeset
|
1 This file is part of MXE. |
2353
99516e73b368
Move doc/index.html -> index.html
Volker Grabsch <vog@notjusthosting.com>
parents:
2333
diff
changeset
|
2 See index.html for further information. |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
3 |
2669 | 4 From 036e8f90ce7f2f1302a2603b89ae7661211c090d Mon Sep 17 00:00:00 2001 |
5 From: Mark Brand <mabrand@mabrand.nl> | |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
6 Date: Fri, 21 Oct 2011 23:08:52 +0200 |
2669 | 7 Subject: [PATCH 1/4] adjustments for mingw-cross-env |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
8 |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
9 |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
10 diff --git a/CMakeLists.txt b/CMakeLists.txt |
2669 | 11 index af8be68..61a5ee7 100644 |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
12 --- a/CMakeLists.txt |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
13 +++ b/CMakeLists.txt |
2669 | 14 @@ -400,6 +400,8 @@ message( STATUS "System: ${CMAKE_SYSTEM_NAME}" ) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
15 # |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
16 #-------------------------------------------------------------------------------------------------- |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
17 |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
18 +uniquely_add_flags( CXXFLAGS "-DBOOST_THREAD_USE_LIB;-DBoost_USE_STATIC_LIBS" ) |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
19 +SET(CMAKE_CXX_FLAGS_RELEASE "-DBOOST_THREAD_USE_LIB -DBoost_USE_STATIC_LIBS -O3 -DNDEBUG" CACHE STRING blah FORCE) |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
20 if( MSVC ) |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
21 |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
22 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" ) |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
23 diff --git a/TryRunResults.cgal.cmake b/TryRunResults.cgal.cmake |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
24 new file mode 100644 |
2305
d04d2339ec39
package cgal: gcc 4.7.0 compatibility fix
Mark Brand <mabrand@mabrand.nl>
parents:
2194
diff
changeset
|
25 index 0000000..299de90 |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
26 --- /dev/null |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
27 +++ b/TryRunResults.cgal.cmake |
2305
d04d2339ec39
package cgal: gcc 4.7.0 compatibility fix
Mark Brand <mabrand@mabrand.nl>
parents:
2194
diff
changeset
|
28 @@ -0,0 +1,198 @@ |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
29 +SET( GCC_RUN_RES |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
30 + 0 |
2305
d04d2339ec39
package cgal: gcc 4.7.0 compatibility fix
Mark Brand <mabrand@mabrand.nl>
parents:
2194
diff
changeset
|
31 + CACHE STRING "version=4.7.0" FORCE) |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
32 +SET( GCC_RUN_RES__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
33 + 0 |
2305
d04d2339ec39
package cgal: gcc 4.7.0 compatibility fix
Mark Brand <mabrand@mabrand.nl>
parents:
2194
diff
changeset
|
34 + CACHE STRING "version=4.7.0" FORCE) |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
35 +SET( GMP_RUN_RES |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
36 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
37 + CACHE STRING "version=5.0.2" FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
38 +SET( GMP_RUN_RES__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
39 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
40 + CACHE STRING "version=5.0.2" FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
41 +SET( MPFR_RUN_RES |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
42 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
43 + CACHE STRING "version=3.1.0" FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
44 +SET( MPFR_RUN_RES__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
45 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
46 + CACHE STRING "version=3.1.0" FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
47 +SET( CGAL_CFG_ARRAY_MEMBER_INITIALIZATION_BUG |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
48 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
49 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
50 +SET( CGAL_CFG_ARRAY_MEMBER_INITIALIZATION_BUG__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
51 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
52 + CACHE STRING " " FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
53 +SET( CGAL_CFG_DENORMALS_COMPILE_BUG |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
54 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
55 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
56 +SET( CGAL_CFG_DENORMALS_COMPILE_BUG__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
57 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
58 + CACHE STRING " " FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
59 +SET( CGAL_CFG_FPU_ROUNDING_MODE_UNWINDING_VC_BUG |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
60 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
61 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
62 +SET( CGAL_CFG_FPU_ROUNDING_MODE_UNWINDING_VC_BUG__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
63 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
64 + CACHE STRING " " FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
65 +SET( CGAL_CFG_IEEE_754_BUG |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
66 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
67 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
68 +SET( CGAL_CFG_IEEE_754_BUG__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
69 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
70 + CACHE STRING " " FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
71 +SET( CGAL_CFG_ISTREAM_INT_BUG |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
72 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
73 + CACHE STRING "7812" FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
74 +SET( CGAL_CFG_ISTREAM_INT_BUG__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
75 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
76 + CACHE STRING "7812" FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
77 +SET( CGAL_CFG_LONGNAME_BUG |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
78 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
79 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
80 +SET( CGAL_CFG_LONGNAME_BUG__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
81 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
82 + CACHE STRING " " FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
83 +SET( CGAL_CFG_MATCHING_BUG_5 |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
84 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
85 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
86 +SET( CGAL_CFG_MATCHING_BUG_5__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
87 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
88 + CACHE STRING " " FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
89 +SET( CGAL_CFG_MATCHING_BUG_6 |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
90 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
91 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
92 +SET( CGAL_CFG_MATCHING_BUG_6__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
93 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
94 + CACHE STRING " " FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
95 +SET( CGAL_CFG_NESTED_CLASS_FRIEND_DECLARATION_BUG |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
96 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
97 + CACHE STRING "A's do_something\nC's do_something\nB's do_something\nC's do_something" FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
98 +SET( CGAL_CFG_NESTED_CLASS_FRIEND_DECLARATION_BUG__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
99 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
100 + CACHE STRING "A's do_something\nC's do_something\nB's do_something\nC's do_something" FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
101 +SET( CGAL_CFG_NO_CPP0X_DELETED_AND_DEFAULT_FUNCTIONS |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
102 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
103 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
104 +SET( CGAL_CFG_NO_CPP0X_DELETED_AND_DEFAULT_FUNCTIONS__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
105 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
106 + CACHE STRING " " FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
107 +SET( CGAL_CFG_NO_CPP0X_ISFINITE |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
108 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
109 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
110 +SET( CGAL_CFG_NO_CPP0X_ISFINITE__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
111 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
112 + CACHE STRING " " FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
113 +SET( CGAL_CFG_NO_CPP0X_LONG_LONG |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
114 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
115 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
116 +SET( CGAL_CFG_NO_CPP0X_LONG_LONG__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
117 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
118 + CACHE STRING " " FORCE) |
2305
d04d2339ec39
package cgal: gcc 4.7.0 compatibility fix
Mark Brand <mabrand@mabrand.nl>
parents:
2194
diff
changeset
|
119 +SET( CGAL_CFG_NO_CPP0X_DELEGATING_CONSTRUCTORS |
d04d2339ec39
package cgal: gcc 4.7.0 compatibility fix
Mark Brand <mabrand@mabrand.nl>
parents:
2194
diff
changeset
|
120 + 0 |
d04d2339ec39
package cgal: gcc 4.7.0 compatibility fix
Mark Brand <mabrand@mabrand.nl>
parents:
2194
diff
changeset
|
121 + CACHE STRING " " FORCE) |
d04d2339ec39
package cgal: gcc 4.7.0 compatibility fix
Mark Brand <mabrand@mabrand.nl>
parents:
2194
diff
changeset
|
122 +SET( CGAL_CFG_NO_CPP0X_DELEGATING_CONSTRUCTORS__TRYRUN_OUTPUT |
d04d2339ec39
package cgal: gcc 4.7.0 compatibility fix
Mark Brand <mabrand@mabrand.nl>
parents:
2194
diff
changeset
|
123 + 0 |
d04d2339ec39
package cgal: gcc 4.7.0 compatibility fix
Mark Brand <mabrand@mabrand.nl>
parents:
2194
diff
changeset
|
124 + CACHE STRING " " FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
125 +SET( CGAL_CFG_NO_LIMITS |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
126 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
127 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
128 +SET( CGAL_CFG_NO_LIMITS__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
129 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
130 + CACHE STRING " " FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
131 +SET( CGAL_CFG_NO_LOGICAL_OPERATORS_ALTERNATIVES |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
132 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
133 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
134 +SET( CGAL_CFG_NO_LOGICAL_OPERATORS_ALTERNATIVES__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
135 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
136 + CACHE STRING " " FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
137 +SET( CGAL_CFG_NO_MESSAGE_PRAGMA_BUG |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
138 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
139 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
140 +SET( CGAL_CFG_NO_MESSAGE_PRAGMA_BUG__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
141 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
142 + CACHE STRING " " FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
143 +SET( CGAL_CFG_NO_NEXTAFTER |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
144 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
145 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
146 +SET( CGAL_CFG_NO_NEXTAFTER__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
147 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
148 + CACHE STRING " " FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
149 +SET( CGAL_CFG_NO_STATEMENT_EXPRESSIONS |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
150 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
151 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
152 +SET( CGAL_CFG_NO_STATEMENT_EXPRESSIONS__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
153 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
154 + CACHE STRING " " FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
155 +SET( CGAL_CFG_NO_STL |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
156 + 0 |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
157 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
158 +SET( CGAL_CFG_NO_STL__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
159 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
160 + CACHE STRING " " FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
161 +SET( CGAL_CFG_NO_TMPL_IN_TMPL_PARAM |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
162 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
163 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
164 +SET( CGAL_CFG_NO_TMPL_IN_TMPL_PARAM__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
165 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
166 + CACHE STRING " " FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
167 +SET( CGAL_CFG_NO_TR1_ARRAY |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
168 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
169 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
170 +SET( CGAL_CFG_NO_TR1_ARRAY__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
171 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
172 + CACHE STRING " " FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
173 +SET( CGAL_CFG_NO_TR1_TUPLE |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
174 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
175 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
176 +SET( CGAL_CFG_NO_TR1_TUPLE__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
177 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
178 + CACHE STRING " " FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
179 +SET( CGAL_CFG_NO_WARNING_CPP_DIRECTIVE_BUG |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
180 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
181 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
182 +SET( CGAL_CFG_NO_WARNING_CPP_DIRECTIVE_BUG__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
183 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
184 + CACHE STRING " " FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
185 +SET( CGAL_CFG_NUMERIC_LIMITS_BUG |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
186 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
187 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
188 +SET( CGAL_CFG_NUMERIC_LIMITS_BUG__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
189 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
190 + CACHE STRING " " FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
191 +SET( CGAL_CFG_OUTOFLINE_MEMBER_DEFINITION_BUG |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
192 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
193 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
194 +SET( CGAL_CFG_OUTOFLINE_MEMBER_DEFINITION_BUG__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
195 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
196 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
197 +SET( CGAL_CFG_TEMPLATE_IN_DEFAULT_PARAMETER_BUG |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
198 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
199 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
200 +SET( CGAL_CFG_TEMPLATE_IN_DEFAULT_PARAMETER_BUG__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
201 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
202 + CACHE STRING " " FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
203 +SET( CGAL_CFG_TYPENAME_BEFORE_DEFAULT_ARGUMENT_BUG |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
204 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
205 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
206 +SET( CGAL_CFG_TYPENAME_BEFORE_DEFAULT_ARGUMENT_BUG__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
207 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
208 + CACHE STRING " " FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
209 +SET( CGAL_CFG_USING_BASE_MEMBER_BUG_2 |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
210 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
211 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
212 +SET( CGAL_CFG_USING_BASE_MEMBER_BUG_2__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
213 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
214 + CACHE STRING " " FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
215 +SET( ZLIB_RUN_RES |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
216 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
217 + CACHE STRING "version=1.2.5" FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
218 +SET( ZLIB_RUN_RES__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
219 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
220 + CACHE STRING "version=1.2.5" FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
221 +SET( QT4_RUN_RES |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
222 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
223 + CACHE STRING "version=4.8.0" FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
224 +SET( QT4_RUN_RES__TRYRUN_OUTPUT |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
225 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
226 + CACHE STRING "version=4.8.0" FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
227 diff --git a/cmake/modules/FindBoost.cmake b/cmake/modules/FindBoost.cmake |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
228 index fbdde88..5d8a0a9 100644 |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
229 --- a/cmake/modules/FindBoost.cmake |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
230 +++ b/cmake/modules/FindBoost.cmake |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
231 @@ -167,6 +167,7 @@ |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
232 # |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
233 |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
234 include( CGAL_VersionUtils ) |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
235 +set(Boost_USE_STATIC_LIBS ON) |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
236 |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
237 |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
238 #------------------------------------------------------------------------------- |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
239 @@ -706,7 +707,9 @@ ELSE (_boost_IN_CACHE) |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
240 ENDIF( Boost_USE_STATIC_LIBS ) |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
241 |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
242 # Find libraries (search in user defined directories first) |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
243 + SET ( _boost_COMPILER "_win32") |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
244 SET ( _boost_${UPPERCOMPONENT}_LIBRARY_RELEASE_NAMES |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
245 + ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED} |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
246 ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}-${Boost_LIB_VERSION} |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
247 ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_STATIC_TAG}-${Boost_LIB_VERSION} |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
248 ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}-${Boost_LIB_VERSION} |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
249 diff --git a/include/CGAL/Constrained_Delaunay_triangulation_2.h b/include/CGAL/Constrained_Delaunay_triangulation_2.h |
2669 | 250 index c89e7f7..57a5d40 100644 |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
251 --- a/include/CGAL/Constrained_Delaunay_triangulation_2.h |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
252 +++ b/include/CGAL/Constrained_Delaunay_triangulation_2.h |
2306 | 253 @@ -390,7 +390,7 @@ is_flipable(Face_handle f, int i, bool perturb) const |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
254 Face_handle ni = f->neighbor(i); |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
255 if (is_infinite(f) || is_infinite(ni)) return false; |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
256 if (f->is_constrained(i)) return false; |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
257 - return (side_of_oriented_circle(ni, f->vertex(i)->point(), perturb) |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
258 + return (this->side_of_oriented_circle(ni, f->vertex(i)->point(), perturb) |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
259 == ON_POSITIVE_SIDE); |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
260 } |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
261 |
2306 | 262 @@ -494,7 +494,7 @@ test_conflict(const Point& p, Face_handle fh) const |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
263 // return true if P is inside the circumcircle of fh |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
264 // if fh is infinite, return true when p is in the positive |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
265 // halfspace or on the boundary and in the finite edge of fh |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
266 - Oriented_side os = side_of_oriented_circle(fh,p,true); |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
267 + Oriented_side os = this->side_of_oriented_circle(fh,p,true); |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
268 if (os == ON_POSITIVE_SIDE) return true; |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
269 |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
270 if (os == ON_ORIENTED_BOUNDARY && is_infinite(fh)) { |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
271 -- |
2667
8161498e1a42
package cgal: boost 1.50 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
272 1.7.10.4 |
2106
ed6309e7b687
package cgal: fix build failure when qt is present
Mark Brand <mabrand@mabrand.nl>
parents:
2037
diff
changeset
|
273 |
ed6309e7b687
package cgal: fix build failure when qt is present
Mark Brand <mabrand@mabrand.nl>
parents:
2037
diff
changeset
|
274 |
2669 | 275 From a455aa3d21f432831ccafcffc90bc7baf766ce6b Mon Sep 17 00:00:00 2001 |
276 From: Mark Brand <mabrand@mabrand.nl> | |
2106
ed6309e7b687
package cgal: fix build failure when qt is present
Mark Brand <mabrand@mabrand.nl>
parents:
2037
diff
changeset
|
277 Date: Fri, 18 Nov 2011 00:08:25 +0100 |
2667
8161498e1a42
package cgal: boost 1.50 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
278 Subject: [PATCH 2/4] prevent Qt's moc from choking on BOOST_JOIN |
2106
ed6309e7b687
package cgal: fix build failure when qt is present
Mark Brand <mabrand@mabrand.nl>
parents:
2037
diff
changeset
|
279 |
2107
b4f74c721fbe
package cgal: added patch source
Mark Brand <mabrand@mabrand.nl>
parents:
2106
diff
changeset
|
280 Taken from: |
b4f74c721fbe
package cgal: added patch source
Mark Brand <mabrand@mabrand.nl>
parents:
2106
diff
changeset
|
281 https://lists-sop.inria.fr/sympa/arc/cgal-discuss/2011-11/msg00087.html |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
282 |
2305
d04d2339ec39
package cgal: gcc 4.7.0 compatibility fix
Mark Brand <mabrand@mabrand.nl>
parents:
2194
diff
changeset
|
283 diff --git a/cmake/modules/CGAL_Macros.cmake b/cmake/modules/CGAL_Macros.cmake |
2306 | 284 index 62d0485..852fcc9 100644 |
2305
d04d2339ec39
package cgal: gcc 4.7.0 compatibility fix
Mark Brand <mabrand@mabrand.nl>
parents:
2194
diff
changeset
|
285 --- a/cmake/modules/CGAL_Macros.cmake |
d04d2339ec39
package cgal: gcc 4.7.0 compatibility fix
Mark Brand <mabrand@mabrand.nl>
parents:
2194
diff
changeset
|
286 +++ b/cmake/modules/CGAL_Macros.cmake |
2306 | 287 @@ -174,9 +174,9 @@ if( NOT CGAL_MACROS_FILE_INCLUDED ) |
2305
d04d2339ec39
package cgal: gcc 4.7.0 compatibility fix
Mark Brand <mabrand@mabrand.nl>
parents:
2194
diff
changeset
|
288 if ( ${LIB}_RUN_RES EQUAL "0" ) |
d04d2339ec39
package cgal: gcc 4.7.0 compatibility fix
Mark Brand <mabrand@mabrand.nl>
parents:
2194
diff
changeset
|
289 |
d04d2339ec39
package cgal: gcc 4.7.0 compatibility fix
Mark Brand <mabrand@mabrand.nl>
parents:
2194
diff
changeset
|
290 string( REGEX MATCH "version=.*\$" ${LIB}_VERSION_LINE ${${LIB}_OUTPUT} ) |
d04d2339ec39
package cgal: gcc 4.7.0 compatibility fix
Mark Brand <mabrand@mabrand.nl>
parents:
2194
diff
changeset
|
291 - string( REPLACE "\n" "" ${LIB}_VERSION_LINE2 ${${LIB}_VERSION_LINE} ) |
d04d2339ec39
package cgal: gcc 4.7.0 compatibility fix
Mark Brand <mabrand@mabrand.nl>
parents:
2194
diff
changeset
|
292 - string( REPLACE "\r" "" ${LIB}_VERSION_LINE3 ${${LIB}_VERSION_LINE2} ) |
d04d2339ec39
package cgal: gcc 4.7.0 compatibility fix
Mark Brand <mabrand@mabrand.nl>
parents:
2194
diff
changeset
|
293 - string( REPLACE "version=" "" ${LIB}_VERSION ${${LIB}_VERSION_LINE3} ) |
d04d2339ec39
package cgal: gcc 4.7.0 compatibility fix
Mark Brand <mabrand@mabrand.nl>
parents:
2194
diff
changeset
|
294 + string( REPLACE "\n" "" "${LIB}_VERSION_LINE2" "${${LIB}_VERSION_LINE}" ) |
d04d2339ec39
package cgal: gcc 4.7.0 compatibility fix
Mark Brand <mabrand@mabrand.nl>
parents:
2194
diff
changeset
|
295 + string( REPLACE "\r" "" "${LIB}_VERSION_LINE3" "${${LIB}_VERSION_LINE2}" ) |
d04d2339ec39
package cgal: gcc 4.7.0 compatibility fix
Mark Brand <mabrand@mabrand.nl>
parents:
2194
diff
changeset
|
296 + string( REPLACE "version=" "" "${LIB}_VERSION" "${${LIB}_VERSION_LINE3}" ) |
d04d2339ec39
package cgal: gcc 4.7.0 compatibility fix
Mark Brand <mabrand@mabrand.nl>
parents:
2194
diff
changeset
|
297 |
d04d2339ec39
package cgal: gcc 4.7.0 compatibility fix
Mark Brand <mabrand@mabrand.nl>
parents:
2194
diff
changeset
|
298 else() |
d04d2339ec39
package cgal: gcc 4.7.0 compatibility fix
Mark Brand <mabrand@mabrand.nl>
parents:
2194
diff
changeset
|
299 |
2106
ed6309e7b687
package cgal: fix build failure when qt is present
Mark Brand <mabrand@mabrand.nl>
parents:
2037
diff
changeset
|
300 -- |
2667
8161498e1a42
package cgal: boost 1.50 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
301 1.7.10.4 |
2332
39774fa2edd9
package cgal: fix minimum cmake version
Tony Theodore <tonyt@logyst.com>
parents:
2306
diff
changeset
|
302 |
39774fa2edd9
package cgal: fix minimum cmake version
Tony Theodore <tonyt@logyst.com>
parents:
2306
diff
changeset
|
303 |
2669 | 304 From 7225ba1e69c3e4501706e73e2f1e61e3d1313bfa Mon Sep 17 00:00:00 2001 |
305 From: Mark Brand <mabrand@mabrand.nl> | |
306 Date: Fri, 6 Jul 2012 09:27:49 +0200 | |
307 Subject: [PATCH 3/4] update "detected" Qt version | |
2332
39774fa2edd9
package cgal: fix minimum cmake version
Tony Theodore <tonyt@logyst.com>
parents:
2306
diff
changeset
|
308 |
2305
d04d2339ec39
package cgal: gcc 4.7.0 compatibility fix
Mark Brand <mabrand@mabrand.nl>
parents:
2194
diff
changeset
|
309 |
2669 | 310 diff --git a/TryRunResults.cgal.cmake b/TryRunResults.cgal.cmake |
311 index 299de90..f11ddc6 100644 | |
312 --- a/TryRunResults.cgal.cmake | |
313 +++ b/TryRunResults.cgal.cmake | |
314 @@ -192,7 +192,7 @@ SET( ZLIB_RUN_RES__TRYRUN_OUTPUT | |
315 CACHE STRING "version=1.2.5" FORCE) | |
316 SET( QT4_RUN_RES | |
317 0 | |
318 - CACHE STRING "version=4.8.0" FORCE) | |
319 + CACHE STRING "version=4.8.2" FORCE) | |
320 SET( QT4_RUN_RES__TRYRUN_OUTPUT | |
321 0 | |
322 - CACHE STRING "version=4.8.0" FORCE) | |
323 + CACHE STRING "version=4.8.2" FORCE) | |
2332
39774fa2edd9
package cgal: fix minimum cmake version
Tony Theodore <tonyt@logyst.com>
parents:
2306
diff
changeset
|
324 -- |
2667
8161498e1a42
package cgal: boost 1.50 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
325 1.7.10.4 |
8161498e1a42
package cgal: boost 1.50 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
326 |
8161498e1a42
package cgal: boost 1.50 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
327 |
2669 | 328 From c6a34b69b8c538456fa23d07f2914aef6395bcf7 Mon Sep 17 00:00:00 2001 |
2667
8161498e1a42
package cgal: boost 1.50 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
329 From: Mark Brand <mabrand@mabrand.nl> |
8161498e1a42
package cgal: boost 1.50 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
330 Date: Wed, 18 Jul 2012 00:43:17 +0200 |
8161498e1a42
package cgal: boost 1.50 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
331 Subject: [PATCH 4/4] boost 1.50 compatibility |
8161498e1a42
package cgal: boost 1.50 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
332 |
2332
39774fa2edd9
package cgal: fix minimum cmake version
Tony Theodore <tonyt@logyst.com>
parents:
2306
diff
changeset
|
333 |
2667
8161498e1a42
package cgal: boost 1.50 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
334 diff --git a/cmake/modules/CGAL_SetupBoost.cmake b/cmake/modules/CGAL_SetupBoost.cmake |
2669 | 335 index fc3dc11..d72074fd 100644 |
2667
8161498e1a42
package cgal: boost 1.50 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
336 --- a/cmake/modules/CGAL_SetupBoost.cmake |
8161498e1a42
package cgal: boost 1.50 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
337 +++ b/cmake/modules/CGAL_SetupBoost.cmake |
8161498e1a42
package cgal: boost 1.50 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
338 @@ -3,7 +3,7 @@ if ( NOT CGAL_Boost_Setup ) |
8161498e1a42
package cgal: boost 1.50 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
339 include(CGAL_TweakFindBoost) |
8161498e1a42
package cgal: boost 1.50 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
340 # In the documentation, we say we require Boost-1.39, but technically we |
8161498e1a42
package cgal: boost 1.50 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
341 # require 1.33.1. Some packages may require more recent versions, though. |
8161498e1a42
package cgal: boost 1.50 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
342 - find_package( Boost 1.33.1 REQUIRED thread ) |
8161498e1a42
package cgal: boost 1.50 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
343 + find_package( Boost 1.33.1 REQUIRED thread system chrono ) |
8161498e1a42
package cgal: boost 1.50 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
344 |
8161498e1a42
package cgal: boost 1.50 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
345 message( STATUS "Boost include: ${Boost_INCLUDE_DIRS}" ) |
8161498e1a42
package cgal: boost 1.50 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
346 message( STATUS "Boost libraries: ${Boost_LIBRARIES}" ) |
8161498e1a42
package cgal: boost 1.50 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
347 -- |
8161498e1a42
package cgal: boost 1.50 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
348 1.7.10.4 |
8161498e1a42
package cgal: boost 1.50 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
349 |