From c2003e8a2acdd4d654a9e75815a1de51afcbdfc8 Mon Sep 17 00:00:00 2001 From: Simon Giraudot Date: Thu, 17 Dec 2015 10:18:20 +0100 Subject: [PATCH] Add test for c++1z and gnu++XX flags --- Installation/cmake/modules/CGAL_SetupBoost.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Installation/cmake/modules/CGAL_SetupBoost.cmake b/Installation/cmake/modules/CGAL_SetupBoost.cmake index 5e652c9a22c..0d5b5570e72 100644 --- a/Installation/cmake/modules/CGAL_SetupBoost.cmake +++ b/Installation/cmake/modules/CGAL_SetupBoost.cmake @@ -10,10 +10,10 @@ if ( NOT CGAL_Boost_Setup ) AND( #GCC 4.8+ with c++11 on ( NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8 - AND CMAKE_CXX_FLAGS MATCHES "\\-std=c\\+\\+[01][14yx]") + AND CMAKE_CXX_FLAGS MATCHES "\\-std=(c|gnu)\\+\\+[01][14yxz]") #GCC 6.0+ without c++03 on OR ( NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0 - AND NOT CMAKE_CXX_FLAGS MATCHES "\\-std=c\\+\\+[90][83]") + AND NOT CMAKE_CXX_FLAGS MATCHES "\\-std=(c|gnu)\\+\\+[90][83]") ) ) set ( CGAL_requires_Boost_libs FALSE ) endif()