songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

integrated review for the fix

This commit is contained in:
Dmitry Anisimov 2020-05-11 11:29:54 +02:00
parent fc13a42db5
commit 2ef4e362c1
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Installation/CMakeLists.txt
View File

@ -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 )

9
Installation/cmake/modules/CGAL_GeneratorSpecificSettings.cmake
View File

@ -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 "." )