style improvements for projects cgal eigen mpfr

4 files changed, 335 insertions, 18 deletions

diff --git a/src/cgal-1-fixes.patch b/src/cgal-1-fixes.patch
new file mode 100644
index 0000000..0701391
--- /dev/null
+++ b/src/cgal-1-fixes.patch
@@ -0,0 +1,307 @@
+This file is part of mingw-cross-env.
+See doc/index.html for further information.
+
+Contains ad hoc patches for cross building.
+
+From 89e55b180994db937e019678a2abccd0c6f73f7e 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
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -135,6 +135,8 @@ set(ALL_CGAL_LIBRARIES CGAL CGAL_Core CGAL_ImageIO CGAL_Qt3 CGAL_Qt4 CACHE INTER
+ #
+ #--------------------------------------------------------------------------------------------------
+ 
++uniquely_add_flags( CXXFLAGS "-DBOOST_THREAD_USE_LIB;-DBoost_USE_STATIC_LIBS" )
++SET(CMAKE_CXX_FLAGS_RELEASE "-DBOOST_THREAD_USE_LIB -DBoost_USE_STATIC_LIBS -O3 -DNDEBUG" CACHE STRING blah FORCE)
+ if( MSVC )
+   
+   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
+--- /dev/null
++++ b/TryRunResults.cgal.cmake
+@@ -0,0 +1,139 @@
++SET( CGAL_CFG_ARRAY_MEMBER_INITIALIZATION_BUG
++     FAILED_TO_RUN
++     CACHE STRING "Result from TRY_RUN" FORCE)
++SET( CGAL_CFG_DENORMALS_COMPILE_BUG
++     FAILED_TO_RUN
++     CACHE STRING "Result from TRY_RUN" FORCE)
++SET( CGAL_CFG_FPU_ROUNDING_MODE_UNWINDING_VC_BUG
++     FAILED_TO_RUN
++     CACHE STRING "Result from TRY_RUN" FORCE)
++SET( CGAL_CFG_IEEE_754_BUG
++     FAILED_TO_RUN
++     CACHE STRING "Result from TRY_RUN" FORCE)
++SET( CGAL_CFG_ISTREAM_INT_BUG
++     FAILED_TO_RUN
++     CACHE STRING "Result from TRY_RUN" FORCE)
++SET( CGAL_CFG_LONGNAME_BUG
++     FAILED_TO_RUN
++     CACHE STRING "Result from TRY_RUN" FORCE)
++SET( CGAL_CFG_MATCHING_BUG_5
++     FAILED_TO_RUN
++     CACHE STRING "Result from TRY_RUN" FORCE)
++SET( CGAL_CFG_MATCHING_BUG_6
++     FAILED_TO_RUN
++     CACHE STRING "Result from TRY_RUN" FORCE)
++SET( CGAL_CFG_NESTED_CLASS_FRIEND_DECLARATION_BUG
++     FAILED_TO_RUN
++     CACHE STRING "Result from TRY_RUN" FORCE)
++SET( CGAL_CFG_NO_CPP0X_ARRAY
++     FAILED_TO_RUN
++     CACHE STRING "Result from TRY_RUN" FORCE)
++SET( CGAL_CFG_NO_CPP0X_AUTO
++     FAILED_TO_RUN
++     CACHE STRING "Result from TRY_RUN" FORCE)
++SET( CGAL_CFG_NO_CPP0X_DECLTYPE
++     FAILED_TO_RUN
++     CACHE STRING "Result from TRY_RUN" FORCE)
++SET( CGAL_CFG_NO_CPP0X_DEFAULT_TEMPLATE_ARGUMENTS_FOR_FUNCTION_TEMPLATES
++     FAILED_TO_RUN
++     CACHE STRING "Result from TRY_RUN" FORCE)
++SET( CGAL_CFG_NO_CPP0X_DELEGATING_CONSTRUCTORS
++     FAILED_TO_RUN
++     CACHE STRING "Result from TRY_RUN" FORCE)
++SET( CGAL_CFG_NO_CPP0X_DELETED_AND_DEFAULT_FUNCTIONS
++     FAILED_TO_RUN
++     CACHE STRING "Result from TRY_RUN" FORCE)
++SET( CGAL_CFG_NO_CPP0X_INITIALIZER_LISTS
++     FAILED_TO_RUN
++     CACHE STRING "Result from TRY_RUN" FORCE)
++SET( CGAL_CFG_NO_CPP0X_ISFINITE
++     FAILED_TO_RUN
++     CACHE STRING "Result from TRY_RUN" FORCE)
++SET( CGAL_CFG_NO_CPP0X_LAMBDAS
++     FAILED_TO_RUN
++     CACHE STRING "Result from TRY_RUN" FORCE)
++SET( CGAL_CFG_NO_CPP0X_LONG_LONG
++     FAILED_TO_RUN
++     CACHE STRING "Result from TRY_RUN" FORCE)
++SET( CGAL_CFG_NO_CPP0X_RVALUE_REFERENCE
++     FAILED_TO_RUN
++     CACHE STRING "Result from TRY_RUN" FORCE)
++SET( CGAL_CFG_NO_CPP0X_TUPLE
++     FAILED_TO_RUN
++     CACHE STRING "Result from TRY_RUN" FORCE)
++SET( CGAL_CFG_NO_CPP0X_VARIADIC_TEMPLATES
++     FAILED_TO_RUN
++     CACHE STRING "Result from TRY_RUN" FORCE)
++SET( CGAL_CFG_NO_LIMITS
++     FAILED_TO_RUN
++     CACHE STRING "Result from TRY_RUN" FORCE)
++SET( CGAL_CFG_NO_LOGICAL_OPERATORS_ALTERNATIVES
++     FAILED_TO_RUN
++     CACHE STRING "Result from TRY_RUN" FORCE)
++SET( CGAL_CFG_NO_MESSAGE_PRAGMA_BUG
++     FAILED_TO_RUN
++     CACHE STRING "Result from TRY_RUN" FORCE)
++SET( CGAL_CFG_NO_NEXTAFTER
++     FAILED_TO_RUN
++     CACHE STRING "Result from TRY_RUN" FORCE)
++SET( CGAL_CFG_NO_STATEMENT_EXPRESSIONS
++     FAILED_TO_RUN
++     CACHE STRING "Result from TRY_RUN" FORCE)
++SET( CGAL_CFG_NO_STL
++     0
++     CACHE STRING "Result from TRY_RUN" FORCE)
++SET( CGAL_CFG_NO_TMPL_IN_TMPL_PARAM
++     FAILED_TO_RUN
++     CACHE STRING "Result from TRY_RUN" FORCE)
++SET( CGAL_CFG_NO_TR1_ARRAY
++     FAILED_TO_RUN
++     CACHE STRING "Result from TRY_RUN" FORCE)
++SET( CGAL_CFG_NO_TR1_TUPLE
++     FAILED_TO_RUN
++     CACHE STRING "Result from TRY_RUN" FORCE)
++SET( CGAL_CFG_NO_WARNING_CPP_DIRECTIVE_BUG
++     FAILED_TO_RUN
++     CACHE STRING "Result from TRY_RUN" FORCE)
++SET( CGAL_CFG_NUMERIC_LIMITS_BUG
++     FAILED_TO_RUN
++     CACHE STRING "Result from TRY_RUN" FORCE)
++SET( CGAL_CFG_OUTOFLINE_MEMBER_DEFINITION_BUG
++     FAILED_TO_RUN
++     CACHE STRING "Result from TRY_RUN" FORCE)
++SET( CGAL_CFG_TYPENAME_BEFORE_DEFAULT_ARGUMENT_BUG
++     FAILED_TO_RUN
++     CACHE STRING "Result from TRY_RUN" FORCE)
++SET( CGAL_CFG_USING_BASE_MEMBER_BUG_2
++     FAILED_TO_RUN
++     CACHE STRING "Result from TRY_RUN" FORCE)
++SET( GCC_RUN_RES
++     FAILED_TO_RUN
++     CACHE STRING "Result from TRY_RUN" FORCE)
++SET( GMP_RUN_RES
++     FAILED_TO_RUN
++     CACHE STRING "Result from TRY_RUN" FORCE)
++SET( MPFR_RUN_RES
++     FAILED_TO_RUN
++     CACHE STRING "Result from TRY_RUN" FORCE)
++SET( QT4_RUN_RES
++     FAILED_TO_RUN
++     CACHE STRING "Result from TRY_RUN" FORCE)
++SET( ZLIB_RUN_RES
++     FAILED_TO_RUN
++     CACHE STRING "Result from TRY_RUN" FORCE)
++SET( GCC_RUN_RES__TRYRUN_OUTPUT
++     FAILED_TO_RUN
++     CACHE STRING "Result from TRY_RUN" FORCE)
++SET( GMP_RUN_RES__TRYRUN_OUTPUT
++     FAILED_TO_RUN
++     CACHE STRING "Result from TRY_RUN" FORCE)
++SET( MPFR_RUN_RES__TRYRUN_OUTPUT
++     FAILED_TO_RUN
++     CACHE STRING "Result from TRY_RUN" FORCE)
++SET( QT4_RUN_RES__TRYRUN_OUTPUT
++     FAILED_TO_RUN
++     CACHE STRING "Result from TRY_RUN" FORCE)
++SET( ZLIB_RUN_RES__TRYRUN_OUTPUT
++     FAILED_TO_RUN
++     CACHE STRING "Result from TRY_RUN" FORCE)
++
+diff --git a/cmake/modules/FindBoost.cmake b/cmake/modules/FindBoost.cmake
+index fbdde88..5d8a0a9 100644
+--- a/cmake/modules/FindBoost.cmake
++++ b/cmake/modules/FindBoost.cmake
+@@ -167,6 +167,7 @@
+ #

+ 

+ include( CGAL_VersionUtils )

++set(Boost_USE_STATIC_LIBS   ON)

+ 

+ 

+ #-------------------------------------------------------------------------------

+@@ -706,7 +707,9 @@ ELSE (_boost_IN_CACHE)
+     ENDIF( Boost_USE_STATIC_LIBS )

+ 

+     # Find libraries (search in user defined directories first)

++    SET ( _boost_COMPILER "_win32")

+     SET ( _boost_${UPPERCOMPONENT}_LIBRARY_RELEASE_NAMES   

++      ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}

+       ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}-${Boost_LIB_VERSION}

+       ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_STATIC_TAG}-${Boost_LIB_VERSION}

+       ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}-${Boost_LIB_VERSION}

+diff --git a/include/CGAL/Constrained_Delaunay_triangulation_2.h b/include/CGAL/Constrained_Delaunay_triangulation_2.h
+index f1a7201..23a53c9 100644
+--- a/include/CGAL/Constrained_Delaunay_triangulation_2.h
++++ b/include/CGAL/Constrained_Delaunay_triangulation_2.h
+@@ -389,7 +389,7 @@ is_flipable(Face_handle f, int i, bool perturb) const
+   Face_handle ni = f->neighbor(i); 
+   if (is_infinite(f) || is_infinite(ni)) return false; 
+   if (f->is_constrained(i)) return false;
+-  return (side_of_oriented_circle(ni, f->vertex(i)->point(), perturb) 
++  return (this->side_of_oriented_circle(ni, f->vertex(i)->point(), perturb)
+                                         == ON_POSITIVE_SIDE);
+ }
+ 
+@@ -493,7 +493,7 @@ test_conflict(const Point& p, Face_handle fh) const
+   // return true  if P is inside the circumcircle of fh
+   // if fh is infinite, return true when p is in the positive
+   // halfspace or on the boundary and in the  finite edge of fh
+-  Oriented_side os = side_of_oriented_circle(fh,p,true);
++  Oriented_side os = this->side_of_oriented_circle(fh,p,true);
+   if (os == ON_POSITIVE_SIDE) return true;
+  
+   if (os == ON_ORIENTED_BOUNDARY && is_infinite(fh)) {
+-- 
+1.7.7
+
+
+From 409bdc176dd09636a7e80a08bbfade0dadbd198b Mon Sep 17 00:00:00 2001
+From: mingw-cross-env
+Date: Fri, 21 Oct 2011 23:33:52 +0200
+Subject: [PATCH 2/2] disable dependency version checks
+
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7d77f9d..bfc2d91 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -162,7 +162,7 @@ if( "${CMAKE_CXX_COMPILER}" MATCHES "icl" OR "${CMAKE_CXX_COMPILER}" MATCHES "ic
+   message( STATUS "Intel compiler is detected." )
+   set( IntelCompiler_FOUND TRUE )
+ 
+-  get_dependency_version(IntelCompiler)
++  #get_dependency_version(IntelCompiler)
+ 
+   if( "${IntelCompiler_VERSION}" LESS "1100" )
+     message("Intel Compiler version ${IntelCompiler_VERSION} is not supported by CGAL-${CGAL_MAJOR_VERSION}.${CGAL_MINOR_VERSION}! (too old, must be 11.0 or after)")
+@@ -177,7 +177,7 @@ if ( CMAKE_COMPILER_IS_GNUCXX )
+ 
+   set( GCC_FOUND TRUE )
+   
+-  get_dependency_version(GCC)
++  #get_dependency_version(GCC)
+   
+   if ( "${GCC_VERSION}" MATCHES "Not" OR "${GCC_VERSION}" MATCHES "Unknown" )
+     set( GCC_FOUND FALSE )
+diff --git a/cmake/modules/CGAL_SetupGMP.cmake b/cmake/modules/CGAL_SetupGMP.cmake
+index 1ff612c..efca627 100644
+--- a/cmake/modules/CGAL_SetupGMP.cmake
++++ b/cmake/modules/CGAL_SetupGMP.cmake
+@@ -11,14 +11,14 @@ if ( NOT CGAL_GMP_SETUP )
+       message( STATUS "GMP include:     ${GMP_INCLUDE_DIR}" )

+       message( STATUS "GMP libraries:   ${GMP_LIBRARIES}" )

+       message( STATUS "GMP definitions: ${GMP_DEFINITIONS}" )

+-      get_dependency_version(GMP)

++      #get_dependency_version(GMP)

+ 

+       message( STATUS "MPFR include:      ${MPFR_INCLUDE_DIR}" )

+       message( STATUS "MPFR libraries:    ${MPFR_LIBRARIES}" )

+       message( STATUS "MPFR definitions:  ${MPFR_DEFINITIONS}" )

+       set( MPFR_DEPENDENCY_LIBRARIES   ${GMP_LIBRARIES} )

+       set( MPFR_DEPENDENCY_INCLUDE_DIR ${GMP_INCLUDE_DIR} )

+-      get_dependency_version(MPFR)

++      #get_dependency_version(MPFR)

+           

+       set ( CGAL_USE_GMP 1 )

+       set ( CGAL_USE_MPFR 1 )

+diff --git a/src/CGALQt4/CMakeLists.txt b/src/CGALQt4/CMakeLists.txt
+index 0c1b4e9..7d9e6de 100644
+--- a/src/CGALQt4/CMakeLists.txt
++++ b/src/CGALQt4/CMakeLists.txt
+@@ -27,9 +27,9 @@ if( QT4_FOUND )
+     
+     include(${QT_USE_FILE})
+ 
+-    get_dependency_version(OPENGL OpenGL)
++    #get_dependency_version(OPENGL OpenGL)
+     
+-    get_dependency_version(QT4 QT)
++    #get_dependency_version(QT4 QT)
+ 
+     if(COMMAND add_config_flag)
+       set( CGAL_HAS_QT4 TRUE ) 
+diff --git a/src/CGALimageIO/CMakeLists.txt b/src/CGALimageIO/CMakeLists.txt
+index d48a50b..0e06610 100644
+--- a/src/CGALimageIO/CMakeLists.txt
++++ b/src/CGALimageIO/CMakeLists.txt
+@@ -23,7 +23,7 @@ if(WITH_VTK)
+ endif(WITH_VTK)
+ 
+ if(OPENGL_FOUND)
+-  get_dependency_version(OPENGL OpenGL)
++  #get_dependency_version(OPENGL OpenGL)
+   
+   message( STATUS "OpenGL include:     ${OPENGL_INCLUDE_DIR}" )
+   message( STATUS "OpenGL libraries:   ${OPENGL_LIBRARIES}" )
+@@ -32,7 +32,7 @@ if(OPENGL_FOUND)
+   cache_set(CGAL_ImageIO_3RD_PARTY_LIBRARIES    ${OPENGL_LIBRARIES}   )
+ 
+   if(ZLIB_FOUND)
+-    get_dependency_version(ZLIB)
++    #get_dependency_version(ZLIB)
+     message( STATUS "ZLib   include:     ${ZLIB_INCLUDE_DIR}" )
+     message( STATUS "ZLib   libraries:   ${ZLIB_LIBRARY}" )
+     cache_set(CGAL_ImageIO_3RD_PARTY_INCLUDE_DIRS ${CGAL_ImageIO_3RD_PARTY_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} )
+-- 
+1.7.7
+
diff --git a/src/cgal.mk b/src/cgal.mk
index 291821f..36acfd4 100644
--- a/src/cgal.mk
+++ b/src/cgal.mk
@@ -20,18 +20,28 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
-    sed -i 's/\(.*\) _boost_\(..\)UPPERCOMPONENT\(.\)_LIBRARY_RELEASE_NAMES/\1 _boost_COMPILER "_win32")\n&\n      \2Boost_LIB_PREFIX\3boost_\2COMPONENT\3\2_boost_COMPILER\3\2_boost_MULTITHREADED\3/g' '$(1)/cmake/modules/FindBoost.cmake'
-    sed -i 's/include( CGAL_VersionUtils )/include( CGAL_VersionUtils )\nset(Boost_USE_STATIC_LIBS   ON)/g' '$(1)/cmake/modules/FindBoost.cmake'
-    sed -i 's/get_dependency_version/#get_dependency_version/g' '$(1)/cmake/modules/CGAL_SetupGMP.cmake'
-    sed -i 's/get_dependency_version/#get_dependency_version/g' '$(1)/src/CGALQt4/CMakeLists.txt'
-    sed -i 's/get_dependency_version/#get_dependency_version/g' '$(1)/src/CGALimageIO/CMakeLists.txt'
-    sed -i 's/get_dependency_version/#get_dependency_version/g' '$(1)/CMakeLists.txt'
-    sed -i 's/\(if( MSVC )\)/uniquely_add_flags( CXXFLAGS "\-DBOOST_THREAD_USE_LIB;\-DBoost_USE_STATIC_LIBS" )\nSET(CMAKE_CXX_FLAGS_RELEASE "\-DBOOST_THREAD_USE_LIB \-DBoost_USE_STATIC_LIBS \-O3 \-DNDEBUG" CACHE STRING blah FORCE)\n\1/g' '$(1)/CMakeLists.txt'
-    sed -i 's/side_of_oriented_circle(/this\->side_of_oriented_circle(/g' '$(1)/include/CGAL/Constrained_Delaunay_triangulation_2.h'
-    echo -e "SET( CGAL_CFG_ARRAY_MEMBER_INITIALIZATION_BUG\n     FAILED_TO_RUN\n     CACHE STRING \"Result from TRY_RUN\" FORCE)\nSET( CGAL_CFG_DENORMALS_COMPILE_BUG\n     FAILED_TO_RUN\n     CACHE STRING \"Result from TRY_RUN\" FORCE)\nSET( CGAL_CFG_FPU_ROUNDING_MODE_UNWINDING_VC_BUG\n     FAILED_TO_RUN\n     CACHE STRING \"Result from TRY_RUN\" FORCE)\nSET( CGAL_CFG_IEEE_754_BUG\n     FAILED_TO_RUN\n     CACHE STRING \"Result from TRY_RUN\" FORCE)\nSET( CGAL_CFG_ISTREAM_INT_BUG\n     FAILED_TO_RUN\n     CACHE STRING \"Result from TRY_RUN\" FORCE)\nSET( CGAL_CFG_LONGNAME_BUG\n     FAILED_TO_RUN\n     CACHE STRING \"Result from TRY_RUN\" FORCE)\nSET( CGAL_CFG_MATCHING_BUG_5\n     FAILED_TO_RUN\n     CACHE STRING \"Result from TRY_RUN\" FORCE)\nSET( CGAL_CFG_MATCHING_BUG_6\n     FAILED_TO_RUN\n     CACHE STRING \"Result from TRY_RUN\" FORCE)\nSET( CGAL_CFG_NESTED_CLASS_FRIEND_DECLARATION_BUG\n     FAILED_TO_RUN\n     CACHE STRING \"Result from TRY_RUN\" FORCE)\nSET( CGAL_CFG_NO_CPP0X_ARRAY\n     FAILED_TO_RUN\n     CACHE STRING \"Result from TRY_RUN\" FORCE)\nSET( CGAL_CFG_NO_CPP0X_AUTO\n     FAILED_TO_RUN\n     CACHE STRING \"Result from TRY_RUN\" FORCE)\nSET( CGAL_CFG_NO_CPP0X_DECLTYPE\n     FAILED_TO_RUN\n     CACHE STRING \"Result from TRY_RUN\" FORCE)\nSET( CGAL_CFG_NO_CPP0X_DEFAULT_TEMPLATE_ARGUMENTS_FOR_FUNCTION_TEMPLATES\n     FAILED_TO_RUN\n     CACHE STRING \"Result from TRY_RUN\" FORCE)\nSET( CGAL_CFG_NO_CPP0X_DELEGATING_CONSTRUCTORS\n     FAILED_TO_RUN\n     CACHE STRING \"Result from TRY_RUN\" FORCE)\nSET( CGAL_CFG_NO_CPP0X_DELETED_AND_DEFAULT_FUNCTIONS\n     FAILED_TO_RUN\n     CACHE STRING \"Result from TRY_RUN\" FORCE)\nSET( CGAL_CFG_NO_CPP0X_INITIALIZER_LISTS\n     FAILED_TO_RUN\n     CACHE STRING \"Result from TRY_RUN\" FORCE)\nSET( CGAL_CFG_NO_CPP0X_ISFINITE\n     FAILED_TO_RUN\n     CACHE STRING \"Result from TRY_RUN\" FORCE)\nSET( CGAL_CFG_NO_CPP0X_LAMBDAS\n     FAILED_TO_RUN\n     CACHE STRING \"Result from TRY_RUN\" FORCE)\nSET( CGAL_CFG_NO_CPP0X_LONG_LONG\n     FAILED_TO_RUN\n     CACHE STRING \"Result from TRY_RUN\" FORCE)\nSET( CGAL_CFG_NO_CPP0X_RVALUE_REFERENCE\n     FAILED_TO_RUN\n     CACHE STRING \"Result from TRY_RUN\" FORCE)\nSET( CGAL_CFG_NO_CPP0X_TUPLE\n     FAILED_TO_RUN\n     CACHE STRING \"Result from TRY_RUN\" FORCE)\nSET( CGAL_CFG_NO_CPP0X_VARIADIC_TEMPLATES\n     FAILED_TO_RUN\n     CACHE STRING \"Result from TRY_RUN\" FORCE)\nSET( CGAL_CFG_NO_LIMITS\n     FAILED_TO_RUN\n     CACHE STRING \"Result from TRY_RUN\" FORCE)\nSET( CGAL_CFG_NO_LOGICAL_OPERATORS_ALTERNATIVES\n     FAILED_TO_RUN\n     CACHE STRING \"Result from TRY_RUN\" FORCE)\nSET( CGAL_CFG_NO_MESSAGE_PRAGMA_BUG\n     FAILED_TO_RUN\n     CACHE STRING \"Result from TRY_RUN\" FORCE)\nSET( CGAL_CFG_NO_NEXTAFTER\n     FAILED_TO_RUN\n     CACHE STRING \"Result from TRY_RUN\" FORCE)\nSET( CGAL_CFG_NO_STATEMENT_EXPRESSIONS \n     FAILED_TO_RUN\n     CACHE STRING \"Result from TRY_RUN\" FORCE)\nSET( CGAL_CFG_NO_STL\n     0\n     CACHE STRING \"Result from TRY_RUN\" FORCE)\nSET( CGAL_CFG_NO_TMPL_IN_TMPL_PARAM\n     FAILED_TO_RUN\n     CACHE STRING \"Result from TRY_RUN\" FORCE)\nSET( CGAL_CFG_NO_TR1_ARRAY\n     FAILED_TO_RUN\n     CACHE STRING \"Result from TRY_RUN\" FORCE)\nSET( CGAL_CFG_NO_TR1_TUPLE\n     FAILED_TO_RUN\n     CACHE STRING \"Result from TRY_RUN\" FORCE)\nSET( CGAL_CFG_NO_WARNING_CPP_DIRECTIVE_BUG\n     FAILED_TO_RUN\n     CACHE STRING \"Result from TRY_RUN\" FORCE)\nSET( CGAL_CFG_NUMERIC_LIMITS_BUG\n     FAILED_TO_RUN\n     CACHE STRING \"Result from TRY_RUN\" FORCE)\nSET( CGAL_CFG_OUTOFLINE_MEMBER_DEFINITION_BUG\n     FAILED_TO_RUN\n     CACHE STRING \"Result from TRY_RUN\" FORCE)\nSET( CGAL_CFG_TYPENAME_BEFORE_DEFAULT_ARGUMENT_BUG\n     FAILED_TO_RUN\n     CACHE STRING \"Result from TRY_RUN\" FORCE)\nSET( CGAL_CFG_USING_BASE_MEMBER_BUG_2\n     FAILED_TO_RUN\n     CACHE STRING \"Result from TRY_RUN\" FORCE)\nSET( GCC_RUN_RES\n     FAILED_TO_RUN\n     CACHE STRING \"Result from TRY_RUN\" FORCE)\nSET( GMP_RUN_RES\n     FAILED_TO_RUN\n     CACHE STRING \"Result from TRY_RUN\" FORCE)\nSET( MPFR_RUN_RES\n     FAILED_TO_RUN\n     CACHE STRING \"Result from TRY_RUN\" FORCE)\nSET( QT4_RUN_RES \n     FAILED_TO_RUN\n     CACHE STRING \"Result from TRY_RUN\" FORCE)\nSET( ZLIB_RUN_RES \n     FAILED_TO_RUN\n     CACHE STRING \"Result from TRY_RUN\" FORCE)\nSET( GCC_RUN_RES__TRYRUN_OUTPUT\n     FAILED_TO_RUN\n     CACHE STRING \"Result from TRY_RUN\" FORCE)\nSET( GMP_RUN_RES__TRYRUN_OUTPUT\n     FAILED_TO_RUN\n     CACHE STRING \"Result from TRY_RUN\" FORCE)\nSET( MPFR_RUN_RES__TRYRUN_OUTPUT\n     FAILED_TO_RUN\n     CACHE STRING \"Result from TRY_RUN\" FORCE)\nSET( QT4_RUN_RES__TRYRUN_OUTPUT\n     FAILED_TO_RUN\n     CACHE STRING \"Result from TRY_RUN\" FORCE)\nSET( ZLIB_RUN_RES__TRYRUN_OUTPUT\n     FAILED_TO_RUN\n     CACHE STRING \"Result from TRY_RUN\" FORCE)\n" > '$(1)/TryRunResults.cgal.cmake'
-    cd '$(1)' && cmake -DCGAL_INSTALL_CMAKE_DIR:STRING="lib/CGAL" -DCMAKE_BUILD_TYPE:STRING="Release" -DCGAL_INSTALL_INC_DIR:STRING="include" -DCGAL_INSTALL_DOC_DIR:STRING="share/doc/CGAL-3.8" -DQT_QMAKE_EXECUTABLE:FILEPATH="$(PREFIX)/bin/$(TARGET)-qmake" -DCGAL_INSTALL_BIN_DIR:STRING="bin" -DBoost_LIB_DIAGNOSTIC_DEFINITIONS:STRING="-DBOOST_LIB_DIAGNOSTIC" -DWITH_CGAL_Qt3:BOOL="0" -DCMAKE_TOOLCHAIN_FILE=$(PREFIX)/$(TARGET)/share/cmake/mingw-cross-env-conf.cmake -DBOOST_COMPILER=_win32 -DBOOST_THREAD_USE_LIB=1 -DBoost_USE_STATIC_LIBS=1 -C TryRunResults.cgal.cmake .
+    cd '$(1)' && cmake \
+        -DCGAL_INSTALL_CMAKE_DIR:STRING="lib/CGAL" \
+        -DCMAKE_BUILD_TYPE:STRING="Release" \
+        -DCGAL_INSTALL_INC_DIR:STRING="include" \
+        -DCGAL_INSTALL_DOC_DIR:STRING="share/doc/CGAL-3.8" \
+        -DCGAL_INSTALL_BIN_DIR:STRING="bin" \
+        -DBOOST_LIB_DIAGNOSTIC_DEFINITIONS:STRING="-DBOOST_LIB_DIAGNOSTIC" \
+        -DWITH_CGAL_Qt3:BOOL="0" \
+        -DCMAKE_TOOLCHAIN_FILE=$(PREFIX)/$(TARGET)/share/cmake/mingw-cross-env-conf.cmake \
+        -DBOOST_COMPILER=_win32 \
+        -DBOOST_THREAD_USE_LIB=1 \
+        -DBOOST_USE_STATIC_LIBS=1 \
+        -C TryRunResults.cgal.cmake .
     $(MAKE) -C '$(1)' -j $(JOBS)
-    cd '$(1)/examples/AABB_tree' && cmake -DQT_QMAKE_EXECUTABLE:FILEPATH="$(PREFIX)/bin/$(TARGET)-qmake" -DBoost_LIB_DIAGNOSTIC_DEFINITIONS:STRING="-DBOOST_LIB_DIAGNOSTIC" -DWITH_CGAL_Qt3:BOOL="0" -DCMAKE_TOOLCHAIN_FILE=$(PREFIX)/$(TARGET)/share/cmake/mingw-cross-env-conf.cmake -DBOOST_COMPILER=_win32 -DBOOST_THREAD_USE_LIB=1 -DBoost_USE_STATIC_LIBS=1 -DCGAL_DIR:STRING="../.." .
+    cd '$(1)/examples/AABB_tree' && cmake \
+        -DBOOST_LIB_DIAGNOSTIC_DEFINITIONS:STRING="-DBOOST_LIB_DIAGNOSTIC" \
+        -DWITH_CGAL_Qt3:BOOL="0" \
+        -DCMAKE_TOOLCHAIN_FILE=$(PREFIX)/$(TARGET)/share/cmake/mingw-cross-env-conf.cmake \
+        -DBOOST_COMPILER=_win32 \
+        -DBOOST_THREAD_USE_LIB=1 \
+        -DBOOST_USE_STATIC_LIBS=1 \
+        -DCGAL_DIR:STRING="../.." .
     $(MAKE) -C '$(1)/examples/AABB_tree' -j $(JOBS)
     $(MAKE) -C '$(1)' -j $(JOBS) install
     $(INSTALL) '$(1)/examples/AABB_tree/AABB_polyhedron_edge_example.exe' '$(PREFIX)/$(TARGET)/bin/test-libcgal.exe'
diff --git a/src/eigen.mk b/src/eigen.mk
index f0f99c8..16c78a8 100644
--- a/src/eigen.mk
+++ b/src/eigen.mk
@@ -6,10 +6,10 @@ PKG             := eigen
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 2.0.16
 $(PKG)_CHECKSUM := 16732775f93174563e575c3570395a11a5e57104
-$(PKG)_SUBDIR   := eigen-eigen-$($(PKG)_VERSION)
+$(PKG)_SUBDIR   := $(PKG)-$(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := lib$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://eigen.tuxfamily.org/
-$(PKG)_URL      := http://bitbucket.org/eigen/eigen/get/$($(PKG)_FILE)
+$(PKG)_URL      := http://bitbucket.org/$(PKG)/$(PKG)/get/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc
 
 define $(PKG)_UPDATE
diff --git a/src/mpfr.mk b/src/mpfr.mk
index 46e3a66..2efb85f 100644
--- a/src/mpfr.mk
+++ b/src/mpfr.mk
@@ -4,12 +4,12 @@
 # mpfr
 PKG             := mpfr
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3.0.1
-$(PKG)_CHECKSUM := caa0609934c0d2ffa29bd11bfa9c05fbade130eb
-$(PKG)_SUBDIR   := mpfr-$($(PKG)_VERSION)
-$(PKG)_FILE     := mpfr-$($(PKG)_VERSION).tar.gz
+$(PKG)_VERSION  := 3.1.0
+$(PKG)_CHECKSUM := d7d31b1cc796886a61a57a13bf43a496601d46b5
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://www.mpfr.org/
-$(PKG)_URL      := ftp://ftp.gnu.org/pub/gnu/mpfr/$($(PKG)_FILE)
+$(PKG)_URL      := ftp://ftp.gnu.org/pub/gnu/$(PKG)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc gmp
 
 define $(PKG)_UPDATE