From 2ef4e362c1a3cb2cc00be355fdbb5125fd46fc0b Mon Sep 17 00:00:00 2001 From: Dmitry Anisimov Date: Mon, 11 May 2020 11:29:54 +0200 Subject: [PATCH] integrated review for the fix --- Installation/CMakeLists.txt | 8 -------- .../cmake/modules/CGAL_GeneratorSpecificSettings.cmake | 9 +++++++++ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Installation/CMakeLists.txt b/Installation/CMakeLists.txt index aaa999c0753..13ef48188f8 100644 --- a/Installation/CMakeLists.txt +++ b/Installation/CMakeLists.txt @@ -495,14 +495,6 @@ if( "${CMAKE_CXX_COMPILER}" MATCHES "icl" OR "${CMAKE_CXX_COMPILER}" MATCHES "ic endif() endif() -# This fixes the issue #3816 - https://github.com/CGAL/cgal/issues/3816. -if ("${CMAKE_CXX_COMPILER}" MATCHES "xctoolchain") - message(STATUS "Clang compiler is detected.") - if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 11.0.3) - message(STATUS "Boost mp is turned off for all clang versions below 11.0.3!") - uniquely_add_flags(CMAKE_CXX_FLAGS "-DCGAL_DO_NOT_USE_BOOST_MP") - endif() -endif() if ( CMAKE_COMPILER_IS_GNUCXX ) diff --git a/Installation/cmake/modules/CGAL_GeneratorSpecificSettings.cmake b/Installation/cmake/modules/CGAL_GeneratorSpecificSettings.cmake index 366378ea74e..6fc2e5c9edc 100644 --- a/Installation/cmake/modules/CGAL_GeneratorSpecificSettings.cmake +++ b/Installation/cmake/modules/CGAL_GeneratorSpecificSettings.cmake @@ -46,6 +46,15 @@ if ( NOT CGAL_GENERATOR_SPECIFIC_SETTINGS_FILE_INCLUDED ) message(STATUS "Mac Leopard detected") set(CGAL_APPLE_LEOPARD 1) endif() + + # This fixes the issue #3816 - https://github.com/CGAL/cgal/issues/3816. + if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "AppleClang") + message(STATUS "Apple Clang version ${CMAKE_CXX_COMPILER_VERSION} compiler detected") + if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 11.0.3) + message(STATUS "Boost MP is turned off for all Apple Clang versions below 11.0.3!") + uniquely_add_flags(CMAKE_CXX_FLAGS "-DCGAL_DO_NOT_USE_BOOST_MP") + endif() + endif() endif() if ( NOT "${CMAKE_CFG_INTDIR}" STREQUAL "." )