Mercurial > mxe-octave
annotate src/cgal-1-fixes.patch @ 2353:99516e73b368
Move doc/index.html -> index.html
author | Volker Grabsch <vog@notjusthosting.com> |
---|---|
date | Thu, 29 Mar 2012 12:14:15 +0200 |
parents | f653602a0500 |
children | 8161498e1a42 |
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 |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
4 Contains ad hoc patches for cross building. |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
5 |
2332
39774fa2edd9
package cgal: fix minimum cmake version
Tony Theodore <tonyt@logyst.com>
parents:
2306
diff
changeset
|
6 From a2df8b5dea68d02643faa69b7119628eb1751d5e Mon Sep 17 00:00:00 2001 |
2333
f653602a0500
Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents:
2332
diff
changeset
|
7 From: MXE |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
8 Date: Fri, 21 Oct 2011 23:08:52 +0200 |
2333
f653602a0500
Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents:
2332
diff
changeset
|
9 Subject: [PATCH 1/3] adjustments for MXE |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
10 |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
11 |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
12 diff --git a/CMakeLists.txt b/CMakeLists.txt |
2306 | 13 index a0ef19a..bb8c02f 100644 |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
14 --- a/CMakeLists.txt |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
15 +++ b/CMakeLists.txt |
2306 | 16 @@ -359,6 +359,8 @@ message( STATUS "System: ${CMAKE_SYSTEM_NAME}" ) |
2028
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 #-------------------------------------------------------------------------------------------------- |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
19 |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
20 +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
|
21 +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
|
22 if( MSVC ) |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
23 |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
24 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
|
25 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
|
26 new file mode 100644 |
2305
d04d2339ec39
package cgal: gcc 4.7.0 compatibility fix
Mark Brand <mabrand@mabrand.nl>
parents:
2194
diff
changeset
|
27 index 0000000..299de90 |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
28 --- /dev/null |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
29 +++ b/TryRunResults.cgal.cmake |
2305
d04d2339ec39
package cgal: gcc 4.7.0 compatibility fix
Mark Brand <mabrand@mabrand.nl>
parents:
2194
diff
changeset
|
30 @@ -0,0 +1,198 @@ |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
31 +SET( GCC_RUN_RES |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
32 + 0 |
2305
d04d2339ec39
package cgal: gcc 4.7.0 compatibility fix
Mark Brand <mabrand@mabrand.nl>
parents:
2194
diff
changeset
|
33 + CACHE STRING "version=4.7.0" FORCE) |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
34 +SET( GCC_RUN_RES__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
35 + 0 |
2305
d04d2339ec39
package cgal: gcc 4.7.0 compatibility fix
Mark Brand <mabrand@mabrand.nl>
parents:
2194
diff
changeset
|
36 + CACHE STRING "version=4.7.0" FORCE) |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
37 +SET( GMP_RUN_RES |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
38 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
39 + CACHE STRING "version=5.0.2" FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
40 +SET( GMP_RUN_RES__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
41 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
42 + CACHE STRING "version=5.0.2" FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
43 +SET( MPFR_RUN_RES |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
44 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
45 + CACHE STRING "version=3.1.0" FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
46 +SET( MPFR_RUN_RES__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
47 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
48 + CACHE STRING "version=3.1.0" FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
49 +SET( CGAL_CFG_ARRAY_MEMBER_INITIALIZATION_BUG |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
50 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
51 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
52 +SET( CGAL_CFG_ARRAY_MEMBER_INITIALIZATION_BUG__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
53 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
54 + CACHE STRING " " FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
55 +SET( CGAL_CFG_DENORMALS_COMPILE_BUG |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
56 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
57 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
58 +SET( CGAL_CFG_DENORMALS_COMPILE_BUG__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
59 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
60 + CACHE STRING " " FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
61 +SET( CGAL_CFG_FPU_ROUNDING_MODE_UNWINDING_VC_BUG |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
62 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
63 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
64 +SET( CGAL_CFG_FPU_ROUNDING_MODE_UNWINDING_VC_BUG__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
65 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
66 + CACHE STRING " " FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
67 +SET( CGAL_CFG_IEEE_754_BUG |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
68 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
69 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
70 +SET( CGAL_CFG_IEEE_754_BUG__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
71 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
72 + CACHE STRING " " FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
73 +SET( CGAL_CFG_ISTREAM_INT_BUG |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
74 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
75 + CACHE STRING "7812" FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
76 +SET( CGAL_CFG_ISTREAM_INT_BUG__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
77 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
78 + CACHE STRING "7812" FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
79 +SET( CGAL_CFG_LONGNAME_BUG |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
80 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
81 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
82 +SET( CGAL_CFG_LONGNAME_BUG__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
83 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
84 + CACHE STRING " " FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
85 +SET( CGAL_CFG_MATCHING_BUG_5 |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
86 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
87 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
88 +SET( CGAL_CFG_MATCHING_BUG_5__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
89 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
90 + CACHE STRING " " FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
91 +SET( CGAL_CFG_MATCHING_BUG_6 |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
92 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
93 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
94 +SET( CGAL_CFG_MATCHING_BUG_6__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
95 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
96 + CACHE STRING " " FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
97 +SET( CGAL_CFG_NESTED_CLASS_FRIEND_DECLARATION_BUG |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
98 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
99 + 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
|
100 +SET( CGAL_CFG_NESTED_CLASS_FRIEND_DECLARATION_BUG__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
101 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
102 + 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
|
103 +SET( CGAL_CFG_NO_CPP0X_DELETED_AND_DEFAULT_FUNCTIONS |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
104 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
105 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
106 +SET( CGAL_CFG_NO_CPP0X_DELETED_AND_DEFAULT_FUNCTIONS__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
107 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
108 + CACHE STRING " " FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
109 +SET( CGAL_CFG_NO_CPP0X_ISFINITE |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
110 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
111 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
112 +SET( CGAL_CFG_NO_CPP0X_ISFINITE__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
113 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
114 + CACHE STRING " " FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
115 +SET( CGAL_CFG_NO_CPP0X_LONG_LONG |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
116 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
117 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
118 +SET( CGAL_CFG_NO_CPP0X_LONG_LONG__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
119 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
120 + CACHE STRING " " FORCE) |
2305
d04d2339ec39
package cgal: gcc 4.7.0 compatibility fix
Mark Brand <mabrand@mabrand.nl>
parents:
2194
diff
changeset
|
121 +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
|
122 + 0 |
d04d2339ec39
package cgal: gcc 4.7.0 compatibility fix
Mark Brand <mabrand@mabrand.nl>
parents:
2194
diff
changeset
|
123 + CACHE STRING " " FORCE) |
d04d2339ec39
package cgal: gcc 4.7.0 compatibility fix
Mark Brand <mabrand@mabrand.nl>
parents:
2194
diff
changeset
|
124 +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
|
125 + 0 |
d04d2339ec39
package cgal: gcc 4.7.0 compatibility fix
Mark Brand <mabrand@mabrand.nl>
parents:
2194
diff
changeset
|
126 + CACHE STRING " " FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
127 +SET( CGAL_CFG_NO_LIMITS |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
128 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
129 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
130 +SET( CGAL_CFG_NO_LIMITS__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
131 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
132 + CACHE STRING " " FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
133 +SET( CGAL_CFG_NO_LOGICAL_OPERATORS_ALTERNATIVES |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
134 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
135 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
136 +SET( CGAL_CFG_NO_LOGICAL_OPERATORS_ALTERNATIVES__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
137 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
138 + CACHE STRING " " FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
139 +SET( CGAL_CFG_NO_MESSAGE_PRAGMA_BUG |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
140 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
141 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
142 +SET( CGAL_CFG_NO_MESSAGE_PRAGMA_BUG__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
143 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
144 + CACHE STRING " " FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
145 +SET( CGAL_CFG_NO_NEXTAFTER |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
146 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
147 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
148 +SET( CGAL_CFG_NO_NEXTAFTER__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
149 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
150 + CACHE STRING " " FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
151 +SET( CGAL_CFG_NO_STATEMENT_EXPRESSIONS |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
152 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
153 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
154 +SET( CGAL_CFG_NO_STATEMENT_EXPRESSIONS__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
155 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
156 + CACHE STRING " " FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
157 +SET( CGAL_CFG_NO_STL |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
158 + 0 |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
159 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
160 +SET( CGAL_CFG_NO_STL__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
161 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
162 + CACHE STRING " " FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
163 +SET( CGAL_CFG_NO_TMPL_IN_TMPL_PARAM |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
164 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
165 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
166 +SET( CGAL_CFG_NO_TMPL_IN_TMPL_PARAM__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
167 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
168 + CACHE STRING " " FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
169 +SET( CGAL_CFG_NO_TR1_ARRAY |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
170 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
171 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
172 +SET( CGAL_CFG_NO_TR1_ARRAY__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
173 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
174 + CACHE STRING " " FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
175 +SET( CGAL_CFG_NO_TR1_TUPLE |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
176 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
177 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
178 +SET( CGAL_CFG_NO_TR1_TUPLE__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
179 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
180 + CACHE STRING " " FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
181 +SET( CGAL_CFG_NO_WARNING_CPP_DIRECTIVE_BUG |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
182 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
183 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
184 +SET( CGAL_CFG_NO_WARNING_CPP_DIRECTIVE_BUG__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
185 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
186 + CACHE STRING " " FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
187 +SET( CGAL_CFG_NUMERIC_LIMITS_BUG |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
188 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
189 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
190 +SET( CGAL_CFG_NUMERIC_LIMITS_BUG__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
191 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
192 + CACHE STRING " " FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
193 +SET( CGAL_CFG_OUTOFLINE_MEMBER_DEFINITION_BUG |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
194 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
195 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
196 +SET( CGAL_CFG_OUTOFLINE_MEMBER_DEFINITION_BUG__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
197 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
198 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
199 +SET( CGAL_CFG_TEMPLATE_IN_DEFAULT_PARAMETER_BUG |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
200 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
201 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
202 +SET( CGAL_CFG_TEMPLATE_IN_DEFAULT_PARAMETER_BUG__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
203 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
204 + CACHE STRING " " FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
205 +SET( CGAL_CFG_TYPENAME_BEFORE_DEFAULT_ARGUMENT_BUG |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
206 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
207 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
208 +SET( CGAL_CFG_TYPENAME_BEFORE_DEFAULT_ARGUMENT_BUG__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
209 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
210 + CACHE STRING " " FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
211 +SET( CGAL_CFG_USING_BASE_MEMBER_BUG_2 |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
212 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
213 + CACHE STRING " " FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
214 +SET( CGAL_CFG_USING_BASE_MEMBER_BUG_2__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
215 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
216 + CACHE STRING " " FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
217 +SET( ZLIB_RUN_RES |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
218 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
219 + CACHE STRING "version=1.2.5" FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
220 +SET( ZLIB_RUN_RES__TRYRUN_OUTPUT |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
221 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
222 + CACHE STRING "version=1.2.5" FORCE) |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
223 +SET( QT4_RUN_RES |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
224 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
225 + CACHE STRING "version=4.8.0" FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
226 +SET( QT4_RUN_RES__TRYRUN_OUTPUT |
2194
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
227 + 0 |
748f09771e30
update package cgal
Luis Saavedra <luis94855510@gmail.com>
parents:
2107
diff
changeset
|
228 + CACHE STRING "version=4.8.0" FORCE) |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
229 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
|
230 index fbdde88..5d8a0a9 100644 |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
231 --- a/cmake/modules/FindBoost.cmake |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
232 +++ b/cmake/modules/FindBoost.cmake |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
233 @@ -167,6 +167,7 @@ |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
234 # |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
235 |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
236 include( CGAL_VersionUtils ) |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
237 +set(Boost_USE_STATIC_LIBS ON) |
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 |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
240 #------------------------------------------------------------------------------- |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
241 @@ -706,7 +707,9 @@ ELSE (_boost_IN_CACHE) |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
242 ENDIF( Boost_USE_STATIC_LIBS ) |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
243 |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
244 # Find libraries (search in user defined directories first) |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
245 + SET ( _boost_COMPILER "_win32") |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
246 SET ( _boost_${UPPERCOMPONENT}_LIBRARY_RELEASE_NAMES |
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} |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
248 ${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
|
249 ${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
|
250 ${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
|
251 diff --git a/include/CGAL/Constrained_Delaunay_triangulation_2.h b/include/CGAL/Constrained_Delaunay_triangulation_2.h |
2306 | 252 index bb59f8c..9cebb51 100644 |
2028
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
253 --- a/include/CGAL/Constrained_Delaunay_triangulation_2.h |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
254 +++ b/include/CGAL/Constrained_Delaunay_triangulation_2.h |
2306 | 255 @@ -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
|
256 Face_handle ni = f->neighbor(i); |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
257 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
|
258 if (f->is_constrained(i)) return false; |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
259 - 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
|
260 + 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
|
261 == ON_POSITIVE_SIDE); |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
262 } |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
263 |
2306 | 264 @@ -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
|
265 // 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
|
266 // 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
|
267 // 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
|
268 - 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
|
269 + 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
|
270 if (os == ON_POSITIVE_SIDE) return true; |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
271 |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
272 if (os == ON_ORIENTED_BOUNDARY && is_infinite(fh)) { |
457e41afeed7
style improvements for projects cgal eigen mpfr
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
273 -- |
2332
39774fa2edd9
package cgal: fix minimum cmake version
Tony Theodore <tonyt@logyst.com>
parents:
2306
diff
changeset
|
274 1.7.7 |
2106
ed6309e7b687
package cgal: fix build failure when qt is present
Mark Brand <mabrand@mabrand.nl>
parents:
2037
diff
changeset
|
275 |
ed6309e7b687
package cgal: fix build failure when qt is present
Mark Brand <mabrand@mabrand.nl>
parents:
2037
diff
changeset
|
276 |
2332
39774fa2edd9
package cgal: fix minimum cmake version
Tony Theodore <tonyt@logyst.com>
parents:
2306
diff
changeset
|
277 From 7393c43ef7534fc8a9289992cdcb9ebefa293680 Mon Sep 17 00:00:00 2001 |
2333
f653602a0500
Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents:
2332
diff
changeset
|
278 From: MXE |
2106
ed6309e7b687
package cgal: fix build failure when qt is present
Mark Brand <mabrand@mabrand.nl>
parents:
2037
diff
changeset
|
279 Date: Fri, 18 Nov 2011 00:08:25 +0100 |
2332
39774fa2edd9
package cgal: fix minimum cmake version
Tony Theodore <tonyt@logyst.com>
parents:
2306
diff
changeset
|
280 Subject: [PATCH 2/3] 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
|
281 |
2107
b4f74c721fbe
package cgal: added patch source
Mark Brand <mabrand@mabrand.nl>
parents:
2106
diff
changeset
|
282 Taken from: |
b4f74c721fbe
package cgal: added patch source
Mark Brand <mabrand@mabrand.nl>
parents:
2106
diff
changeset
|
283 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
|
284 |
2305
d04d2339ec39
package cgal: gcc 4.7.0 compatibility fix
Mark Brand <mabrand@mabrand.nl>
parents:
2194
diff
changeset
|
285 diff --git a/cmake/modules/CGAL_Macros.cmake b/cmake/modules/CGAL_Macros.cmake |
2306 | 286 index 62d0485..852fcc9 100644 |
2305
d04d2339ec39
package cgal: gcc 4.7.0 compatibility fix
Mark Brand <mabrand@mabrand.nl>
parents:
2194
diff
changeset
|
287 --- a/cmake/modules/CGAL_Macros.cmake |
d04d2339ec39
package cgal: gcc 4.7.0 compatibility fix
Mark Brand <mabrand@mabrand.nl>
parents:
2194
diff
changeset
|
288 +++ b/cmake/modules/CGAL_Macros.cmake |
2306 | 289 @@ -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
|
290 if ( ${LIB}_RUN_RES EQUAL "0" ) |
d04d2339ec39
package cgal: gcc 4.7.0 compatibility fix
Mark Brand <mabrand@mabrand.nl>
parents:
2194
diff
changeset
|
291 |
d04d2339ec39
package cgal: gcc 4.7.0 compatibility fix
Mark Brand <mabrand@mabrand.nl>
parents:
2194
diff
changeset
|
292 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
|
293 - 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
|
294 - 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
|
295 - 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
|
296 + 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
|
297 + 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
|
298 + 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
|
299 |
d04d2339ec39
package cgal: gcc 4.7.0 compatibility fix
Mark Brand <mabrand@mabrand.nl>
parents:
2194
diff
changeset
|
300 else() |
d04d2339ec39
package cgal: gcc 4.7.0 compatibility fix
Mark Brand <mabrand@mabrand.nl>
parents:
2194
diff
changeset
|
301 |
2106
ed6309e7b687
package cgal: fix build failure when qt is present
Mark Brand <mabrand@mabrand.nl>
parents:
2037
diff
changeset
|
302 -- |
2332
39774fa2edd9
package cgal: fix minimum cmake version
Tony Theodore <tonyt@logyst.com>
parents:
2306
diff
changeset
|
303 1.7.7 |
39774fa2edd9
package cgal: fix minimum cmake version
Tony Theodore <tonyt@logyst.com>
parents:
2306
diff
changeset
|
304 |
39774fa2edd9
package cgal: fix minimum cmake version
Tony Theodore <tonyt@logyst.com>
parents:
2306
diff
changeset
|
305 |
39774fa2edd9
package cgal: fix minimum cmake version
Tony Theodore <tonyt@logyst.com>
parents:
2306
diff
changeset
|
306 From ac8a99188725f1cb848c6cec3e33c52363754797 Mon Sep 17 00:00:00 2001 |
2333
f653602a0500
Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents:
2332
diff
changeset
|
307 From: MXE |
2332
39774fa2edd9
package cgal: fix minimum cmake version
Tony Theodore <tonyt@logyst.com>
parents:
2306
diff
changeset
|
308 Date: Wed, 28 Mar 2012 00:25:48 +1100 |
39774fa2edd9
package cgal: fix minimum cmake version
Tony Theodore <tonyt@logyst.com>
parents:
2306
diff
changeset
|
309 Subject: [PATCH 3/3] Cmake min version 2.8.6 is only for Windows DLLs |
39774fa2edd9
package cgal: fix minimum cmake version
Tony Theodore <tonyt@logyst.com>
parents:
2306
diff
changeset
|
310 |
39774fa2edd9
package cgal: fix minimum cmake version
Tony Theodore <tonyt@logyst.com>
parents:
2306
diff
changeset
|
311 http://www.cgal.org/Manual/latest/doc_html/installation_manual/Chapter_installation_manual.html |
39774fa2edd9
package cgal: fix minimum cmake version
Tony Theodore <tonyt@logyst.com>
parents:
2306
diff
changeset
|
312 |
39774fa2edd9
package cgal: fix minimum cmake version
Tony Theodore <tonyt@logyst.com>
parents:
2306
diff
changeset
|
313 Section 3: |
39774fa2edd9
package cgal: fix minimum cmake version
Tony Theodore <tonyt@logyst.com>
parents:
2306
diff
changeset
|
314 "On Windows, CMake version 2.8.6 or higher is required, for a proper support of DLLs generation." |
2305
d04d2339ec39
package cgal: gcc 4.7.0 compatibility fix
Mark Brand <mabrand@mabrand.nl>
parents:
2194
diff
changeset
|
315 |
2332
39774fa2edd9
package cgal: fix minimum cmake version
Tony Theodore <tonyt@logyst.com>
parents:
2306
diff
changeset
|
316 diff --git a/CMakeLists.txt b/CMakeLists.txt |
39774fa2edd9
package cgal: fix minimum cmake version
Tony Theodore <tonyt@logyst.com>
parents:
2306
diff
changeset
|
317 index bb8c02f..1f0a4cb 100644 |
39774fa2edd9
package cgal: fix minimum cmake version
Tony Theodore <tonyt@logyst.com>
parents:
2306
diff
changeset
|
318 --- a/CMakeLists.txt |
39774fa2edd9
package cgal: fix minimum cmake version
Tony Theodore <tonyt@logyst.com>
parents:
2306
diff
changeset
|
319 +++ b/CMakeLists.txt |
39774fa2edd9
package cgal: fix minimum cmake version
Tony Theodore <tonyt@logyst.com>
parents:
2306
diff
changeset
|
320 @@ -6,7 +6,7 @@ |
39774fa2edd9
package cgal: fix minimum cmake version
Tony Theodore <tonyt@logyst.com>
parents:
2306
diff
changeset
|
321 project(CGAL CXX) |
39774fa2edd9
package cgal: fix minimum cmake version
Tony Theodore <tonyt@logyst.com>
parents:
2306
diff
changeset
|
322 |
39774fa2edd9
package cgal: fix minimum cmake version
Tony Theodore <tonyt@logyst.com>
parents:
2306
diff
changeset
|
323 # Minimal version of CMake: |
39774fa2edd9
package cgal: fix minimum cmake version
Tony Theodore <tonyt@logyst.com>
parents:
2306
diff
changeset
|
324 -if(WIN32) |
39774fa2edd9
package cgal: fix minimum cmake version
Tony Theodore <tonyt@logyst.com>
parents:
2306
diff
changeset
|
325 +if(WIN32 AND BUILD_SHARED_LIBS) |
39774fa2edd9
package cgal: fix minimum cmake version
Tony Theodore <tonyt@logyst.com>
parents:
2306
diff
changeset
|
326 cmake_minimum_required(VERSION 2.8.6) |
39774fa2edd9
package cgal: fix minimum cmake version
Tony Theodore <tonyt@logyst.com>
parents:
2306
diff
changeset
|
327 else() |
39774fa2edd9
package cgal: fix minimum cmake version
Tony Theodore <tonyt@logyst.com>
parents:
2306
diff
changeset
|
328 cmake_minimum_required(VERSION 2.6.2) |
39774fa2edd9
package cgal: fix minimum cmake version
Tony Theodore <tonyt@logyst.com>
parents:
2306
diff
changeset
|
329 -- |
39774fa2edd9
package cgal: fix minimum cmake version
Tony Theodore <tonyt@logyst.com>
parents:
2306
diff
changeset
|
330 1.7.7 |
39774fa2edd9
package cgal: fix minimum cmake version
Tony Theodore <tonyt@logyst.com>
parents:
2306
diff
changeset
|
331 |