Mercurial > mxe-octave

comparison src/cgal-1-fixes.patch @ 2332:39774fa2edd9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
package cgal: fix minimum cmake version
author Tony Theodore <tonyt@logyst.com>
date Wed, 28 Mar 2012 00:33:05 +1100
parents 5e2618870aea
children f653602a0500
comparison
equal deleted inserted replaced
2331:0148ba5c1bd7 2332:39774fa2edd9
1 This file is part of mingw-cross-env. 1 This file is part of mingw-cross-env.
2 See doc/index.html for further information. 2 See doc/index.html for further information.
3 3
4 Contains ad hoc patches for cross building. 4 Contains ad hoc patches for cross building.
5 5
6 From 2d2576f140b49438678b72b5e8e10fff3d77f37d Mon Sep 17 00:00:00 2001 6 From a2df8b5dea68d02643faa69b7119628eb1751d5e Mon Sep 17 00:00:00 2001
7 From: mingw-cross-env 7 From: mingw-cross-env
8 Date: Fri, 21 Oct 2011 23:08:52 +0200 8 Date: Fri, 21 Oct 2011 23:08:52 +0200
9 Subject: [PATCH 1/2] adjustments for mingw-cross-env 9 Subject: [PATCH 1/3] adjustments for mingw-cross-env
10 10
11 11
12 diff --git a/CMakeLists.txt b/CMakeLists.txt 12 diff --git a/CMakeLists.txt b/CMakeLists.txt
13 index a0ef19a..bb8c02f 100644 13 index a0ef19a..bb8c02f 100644
14 --- a/CMakeLists.txt 14 --- a/CMakeLists.txt
269 + Oriented_side os = this->side_of_oriented_circle(fh,p,true); 269 + Oriented_side os = this->side_of_oriented_circle(fh,p,true);
270 if (os == ON_POSITIVE_SIDE) return true; 270 if (os == ON_POSITIVE_SIDE) return true;
271 271
272 if (os == ON_ORIENTED_BOUNDARY && is_infinite(fh)) { 272 if (os == ON_ORIENTED_BOUNDARY && is_infinite(fh)) {
273 -- 273 --
274 1.7.9.2 274 1.7.7
275 275
276 276
277 From bee019d7435d634544024e544cae36e34a0a4dc5 Mon Sep 17 00:00:00 2001 277 From 7393c43ef7534fc8a9289992cdcb9ebefa293680 Mon Sep 17 00:00:00 2001
278 From: mingw-cross-env 278 From: mingw-cross-env
279 Date: Fri, 18 Nov 2011 00:08:25 +0100 279 Date: Fri, 18 Nov 2011 00:08:25 +0100
280 Subject: [PATCH 2/2] prevent Qt's moc from choking on BOOST_JOIN 280 Subject: [PATCH 2/3] prevent Qt's moc from choking on BOOST_JOIN
281 281
282 Taken from: 282 Taken from:
283 https://lists-sop.inria.fr/sympa/arc/cgal-discuss/2011-11/msg00087.html 283 https://lists-sop.inria.fr/sympa/arc/cgal-discuss/2011-11/msg00087.html
284 284
285 diff --git a/cmake/modules/CGAL_Macros.cmake b/cmake/modules/CGAL_Macros.cmake 285 diff --git a/cmake/modules/CGAL_Macros.cmake b/cmake/modules/CGAL_Macros.cmake
298 + string( REPLACE "version=" "" "${LIB}_VERSION" "${${LIB}_VERSION_LINE3}" ) 298 + string( REPLACE "version=" "" "${LIB}_VERSION" "${${LIB}_VERSION_LINE3}" )
299 299
300 else() 300 else()
301 301
302 -- 302 --
303 1.7.9.2 303 1.7.7
304 304
305
306 From ac8a99188725f1cb848c6cec3e33c52363754797 Mon Sep 17 00:00:00 2001
307 From: mingw-cross-env
308 Date: Wed, 28 Mar 2012 00:25:48 +1100
309 Subject: [PATCH 3/3] Cmake min version 2.8.6 is only for Windows DLLs
310
311 http://www.cgal.org/Manual/latest/doc_html/installation_manual/Chapter_installation_manual.html
312
313 Section 3:
314 "On Windows, CMake version 2.8.6 or higher is required, for a proper support of DLLs generation."
315
316 diff --git a/CMakeLists.txt b/CMakeLists.txt
317 index bb8c02f..1f0a4cb 100644
318 --- a/CMakeLists.txt
319 +++ b/CMakeLists.txt
320 @@ -6,7 +6,7 @@
321 project(CGAL CXX)
322
323 # Minimal version of CMake:
324 -if(WIN32)
325 +if(WIN32 AND BUILD_SHARED_LIBS)
326 cmake_minimum_required(VERSION 2.8.6)
327 else()
328 cmake_minimum_required(VERSION 2.6.2)
329 --
330 1.7.7
331