From 263a5715f2eddc64c12784f36935d3f50baa5727 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Mon, 26 Nov 2018 16:29:16 +0100 Subject: [PATCH] Try to use LEDA without -ffriend-injection --- Installation/cmake/modules/CGAL_UseLEDA.cmake | 3 --- Installation/cmake/modules/FindLEDA.cmake | 5 ----- 2 files changed, 8 deletions(-) diff --git a/Installation/cmake/modules/CGAL_UseLEDA.cmake b/Installation/cmake/modules/CGAL_UseLEDA.cmake index ead5900736c..70474f24a29 100644 --- a/Installation/cmake/modules/CGAL_UseLEDA.cmake +++ b/Installation/cmake/modules/CGAL_UseLEDA.cmake @@ -21,9 +21,6 @@ if ( LEDA_FOUND AND NOT LEDA_SETUP ) link_libraries( ${LEDA_LIBRARIES} ) endif() - if (LEDA_CGAL_FRIEND_INJECTION) - message( STATUS "${LEDA_CGAL_FRIEND_INJECTION}" ) - endif() if (LEDA_CGAL_NO_STRICT_ALIASING) message( STATUS "${LEDA_CGAL_NO_STRICT_ALIASING}" ) endif() diff --git a/Installation/cmake/modules/FindLEDA.cmake b/Installation/cmake/modules/FindLEDA.cmake index 1fc99eeecc3..9c50f51807a 100644 --- a/Installation/cmake/modules/FindLEDA.cmake +++ b/Installation/cmake/modules/FindLEDA.cmake @@ -92,11 +92,6 @@ if ( LEDA_INCLUDE_DIR AND LEDA_LIBRARIES) if ( CMAKE_COMPILER_IS_GNUCXX ) get_dependency_version (GCC) - if ( NOT "${GCC_VERSION}" VERSION_LESS "4.1" ) - set(LEDA_CGAL_FRIEND_INJECTION TRUE) - typed_cache_set( INTERNAL "Add -ffriend-injection on gcc >= 4.1" LEDA_CGAL_FRIEND_INJECTION "Using LEDA with gcc version 4.1 or later: Adding -ffriend-injection") - uniquely_add_flags (LEDA_CXX_FLAGS "-ffriend-injection") - endif() if ( NOT "${GCC_VERSION}" VERSION_LESS "4.4" ) set(LEDA_CGAL_NO_STRICT_ALIASING TRUE) typed_cache_set( INTERNAL "Add -fno-strict-aliasing on gcc >= 4.4" LEDA_CGAL_NO_STRICT_ALIASING "Using LEDA with gcc version 4.4 or later: Adding -fno-strict-aliasing")