From ee31e79906667e1463b382f0283bee492b535e70 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Mon, 9 Aug 2010 14:02:11 +0000 Subject: [PATCH] GMP/MPFR without auto-link is now the default under Windows. Auto-link is for only CGAL libraries, Boost libraries, and Blas/Lapack/TAUCS (when needed). --- .../modules/CGAL_GeneratorSpecificSettings.cmake | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/Installation/cmake/modules/CGAL_GeneratorSpecificSettings.cmake b/Installation/cmake/modules/CGAL_GeneratorSpecificSettings.cmake index 0be751a53c5..ca9e2814547 100644 --- a/Installation/cmake/modules/CGAL_GeneratorSpecificSettings.cmake +++ b/Installation/cmake/modules/CGAL_GeneratorSpecificSettings.cmake @@ -8,19 +8,13 @@ if ( NOT CGAL_GENERATOR_SPECIFIC_SETTINGS_FILE_INCLUDED ) set(CGAL_AUTO_LINK_ENABLED TRUE) if(NOT CGAL_CONFIG_LOADED) - if(MSVC10) - set(CGAL_AUTO_LINK_GMP FALSE - CACHE BOOL "Enable/Disable auto-linking for the external library GMP") + set(CGAL_AUTO_LINK_GMP FALSE + CACHE BOOL "Enable/Disable auto-linking for the external library GMP") - set(CGAL_AUTO_LINK_MPFR FALSE - CACHE BOOL "Enable/Disable auto-linking for the external library MPFR") - else(MSVC10) - set(CGAL_AUTO_LINK_GMP TRUE - CACHE BOOL "Enable/Disable auto-linking for the external library GMP") + set(CGAL_AUTO_LINK_MPFR FALSE + CACHE BOOL "Enable/Disable auto-linking for the external library MPFR") - set(CGAL_AUTO_LINK_MPFR TRUE - CACHE BOOL "Enable/Disable auto-linking for the external library MPFR") - endif(MSVC10) + mark_as_advanced(CGAL_AUTO_LINK_MPFR CGAL_AUTO_LINK_GMP) endif() endif()