diff options
| -rw-r--r-- | src/cgal-1-fixes.patch | 39 |
1 files changed, 33 insertions, 6 deletions
diff --git a/src/cgal-1-fixes.patch b/src/cgal-1-fixes.patch index 96ae374..e452e65 100644 --- a/src/cgal-1-fixes.patch +++ b/src/cgal-1-fixes.patch @@ -3,10 +3,10 @@ See doc/index.html for further information. Contains ad hoc patches for cross building. -From 2d2576f140b49438678b72b5e8e10fff3d77f37d Mon Sep 17 00:00:00 2001 +From a2df8b5dea68d02643faa69b7119628eb1751d5e Mon Sep 17 00:00:00 2001 From: mingw-cross-env Date: Fri, 21 Oct 2011 23:08:52 +0200 -Subject: [PATCH 1/2] adjustments for mingw-cross-env +Subject: [PATCH 1/3] adjustments for mingw-cross-env diff --git a/CMakeLists.txt b/CMakeLists.txt @@ -271,13 +271,13 @@ index bb59f8c..9cebb51 100644 if (os == ON_ORIENTED_BOUNDARY && is_infinite(fh)) { -- -1.7.9.2 +1.7.7 -From bee019d7435d634544024e544cae36e34a0a4dc5 Mon Sep 17 00:00:00 2001 +From 7393c43ef7534fc8a9289992cdcb9ebefa293680 Mon Sep 17 00:00:00 2001 From: mingw-cross-env Date: Fri, 18 Nov 2011 00:08:25 +0100 -Subject: [PATCH 2/2] prevent Qt's moc from choking on BOOST_JOIN +Subject: [PATCH 2/3] prevent Qt's moc from choking on BOOST_JOIN Taken from: https://lists-sop.inria.fr/sympa/arc/cgal-discuss/2011-11/msg00087.html @@ -300,5 +300,32 @@ index 62d0485..852fcc9 100644 else()
-- -1.7.9.2 +1.7.7 + + +From ac8a99188725f1cb848c6cec3e33c52363754797 Mon Sep 17 00:00:00 2001 +From: mingw-cross-env +Date: Wed, 28 Mar 2012 00:25:48 +1100 +Subject: [PATCH 3/3] Cmake min version 2.8.6 is only for Windows DLLs + +http://www.cgal.org/Manual/latest/doc_html/installation_manual/Chapter_installation_manual.html + +Section 3: +"On Windows, CMake version 2.8.6 or higher is required, for a proper support of DLLs generation." + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bb8c02f..1f0a4cb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,7 +6,7 @@ + project(CGAL CXX) + + # Minimal version of CMake: +-if(WIN32) ++if(WIN32 AND BUILD_SHARED_LIBS) + cmake_minimum_required(VERSION 2.8.6) + else() + cmake_minimum_required(VERSION 2.6.2) +-- +1.7.7 |