Mercurial > mxe-octave
changeset 2305:d04d2339ec39
package cgal: gcc 4.7.0 compatibility fix
---
src/cgal-1-fixes.patch | 60 +++++++++++++++++++++++++++---------------------
1 file changed, 34 insertions(+), 26 deletions(-)
| author | Mark Brand <mabrand@mabrand.nl> |
|---|---|
| date | Sat, 24 Mar 2012 10:47:18 +0100 |
| parents | e2767e842034 |
| children | 5e2618870aea |
| files | src/cgal-1-fixes.patch |
| diffstat | 1 files changed, 34 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/src/cgal-1-fixes.patch Sat Mar 24 02:56:03 2012 +0100 +++ b/src/cgal-1-fixes.patch Sat Mar 24 10:47:18 2012 +0100 @@ -3,17 +3,17 @@ Contains ad hoc patches for cross building. -From 89e55b180994db937e019678a2abccd0c6f73f7e Mon Sep 17 00:00:00 2001 +From 497bfdc8ced3d3327e76cc9ebf2ae64c3a2c9593 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 diff --git a/CMakeLists.txt b/CMakeLists.txt -index e5af443..7d77f9d 100644 +index 47f6171..5edfed3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -326,6 +326,8 @@ +@@ -326,6 +326,8 @@ message( STATUS "System: ${CMAKE_SYSTEM_NAME}" ) # #-------------------------------------------------------------------------------------------------- @@ -24,16 +24,16 @@ uniquely_add_flags ( CGAL_CXX_FLAGS "-D_CRT_SECURE_NO_DEPRECATE;-D_SCL_SECURE_NO_DEPRECATE;-D_CRT_SECURE_NO_WARNINGS;-D_SCL_SECURE_NO_WARNINGS" ) diff --git a/TryRunResults.cgal.cmake b/TryRunResults.cgal.cmake new file mode 100644 -index 0000000..cba9b44 +index 0000000..299de90 --- /dev/null +++ b/TryRunResults.cgal.cmake -@@ -0,0 +1,192 @@ +@@ -0,0 +1,198 @@ +SET( GCC_RUN_RES + 0 -+ CACHE STRING "version=4.6.2" FORCE) ++ CACHE STRING "version=4.7.0" FORCE) +SET( GCC_RUN_RES__TRYRUN_OUTPUT + 0 -+ CACHE STRING "version=4.6.2" FORCE) ++ CACHE STRING "version=4.7.0" FORCE) +SET( GMP_RUN_RES + 0 + CACHE STRING "version=5.0.2" FORCE) @@ -118,6 +118,12 @@ +SET( CGAL_CFG_NO_CPP0X_LONG_LONG__TRYRUN_OUTPUT + 0 + CACHE STRING " " FORCE) ++SET( CGAL_CFG_NO_CPP0X_DELEGATING_CONSTRUCTORS ++ 0 ++ CACHE STRING " " FORCE) ++SET( CGAL_CFG_NO_CPP0X_DELEGATING_CONSTRUCTORS__TRYRUN_OUTPUT ++ 0 ++ CACHE STRING " " FORCE) +SET( CGAL_CFG_NO_LIMITS + 0 + CACHE STRING " " FORCE) @@ -265,10 +271,10 @@ if (os == ON_ORIENTED_BOUNDARY && is_infinite(fh)) { -- -1.7.7.3 +1.7.9.2 -From aae0b2e8745754a1d90e080d6afb15f177b0705b Mon Sep 17 00:00:00 2001 +From f8e9cd41103b5ff7dba17a3788ca30830f76352d 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 @@ -276,6 +282,23 @@ Taken from: https://lists-sop.inria.fr/sympa/arc/cgal-discuss/2011-11/msg00087.html +diff --git a/cmake/modules/CGAL_Macros.cmake b/cmake/modules/CGAL_Macros.cmake +index 27dfcd1..edbfbee 100644 +--- a/cmake/modules/CGAL_Macros.cmake ++++ b/cmake/modules/CGAL_Macros.cmake +@@ -164,9 +164,9 @@ if( NOT CGAL_MACROS_FILE_INCLUDED ) + if ( ${LIB}_RUN_RES EQUAL "0" ) + + string( REGEX MATCH "version=.*\$" ${LIB}_VERSION_LINE ${${LIB}_OUTPUT} ) +- string( REPLACE "\n" "" ${LIB}_VERSION_LINE2 ${${LIB}_VERSION_LINE} ) +- string( REPLACE "\r" "" ${LIB}_VERSION_LINE3 ${${LIB}_VERSION_LINE2} ) +- string( REPLACE "version=" "" ${LIB}_VERSION ${${LIB}_VERSION_LINE3} ) ++ string( REPLACE "\n" "" "${LIB}_VERSION_LINE2" "${${LIB}_VERSION_LINE}" ) ++ string( REPLACE "\r" "" "${LIB}_VERSION_LINE3" "${${LIB}_VERSION_LINE2}" ) ++ string( REPLACE "version=" "" "${LIB}_VERSION" "${${LIB}_VERSION_LINE3}" ) + + else() + diff --git a/include/CGAL/Qt/GraphicsItem.h b/include/CGAL/Qt/GraphicsItem.h index 7348d02..807e200 100644 --- a/include/CGAL/Qt/GraphicsItem.h @@ -305,20 +328,5 @@ namespace CGAL { -- -1.7.7.3 -diff --git a/cmake/modules/CGAL_Macros.cmake b/cmake/modules/CGAL_Macros.cmake ---- a/cmake/modules/CGAL_Macros.cmake 2011-12-28 15:19:49.885888900 -0300 -+++ b/cmake/modules/CGAL_Macros.cmake 2011-12-28 15:20:20.435888915 -0300 -@@ -164,9 +164,9 @@ - if ( ${LIB}_RUN_RES EQUAL "0" ) - - string( REGEX MATCH "version=.*\$" ${LIB}_VERSION_LINE ${${LIB}_OUTPUT} ) -- string( REPLACE "\n" "" ${LIB}_VERSION_LINE2 ${${LIB}_VERSION_LINE} ) -- string( REPLACE "\r" "" ${LIB}_VERSION_LINE3 ${${LIB}_VERSION_LINE2} ) -- string( REPLACE "version=" "" ${LIB}_VERSION ${${LIB}_VERSION_LINE3} ) -+ string( REPLACE "\n" "" "${LIB}_VERSION_LINE2" "${${LIB}_VERSION_LINE}" ) -+ string( REPLACE "\r" "" "${LIB}_VERSION_LINE3" "${${LIB}_VERSION_LINE2}" ) -+ string( REPLACE "version=" "" "${LIB}_VERSION" "${${LIB}_VERSION_LINE3}" ) - - else() - +1.7.9.2 +