From 027dac0358de7d07f772c32cbdf2306dfeae714b Mon Sep 17 00:00:00 2001
From: vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Wed, 6 Jun 2018 22:00:46 +0000
Subject: Merge of branch thread_local_optional_vincent to take into account
 XCode < v.8 as thread local is not available

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@3554 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: 9dcf072a4606d1131a925bca4571f0f1b5547d14
---
 src/cython/CMakeLists.txt | 27 +--------------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

(limited to 'src/cython/CMakeLists.txt')

diff --git a/src/cython/CMakeLists.txt b/src/cython/CMakeLists.txt
index 158c7561..17d440ee 100644
--- a/src/cython/CMakeLists.txt
+++ b/src/cython/CMakeLists.txt
@@ -1,7 +1,5 @@
 project(Cython)
 
-include(CheckCXXSourceCompiles)
-
 function( add_gudhi_cython_lib THE_LIB )
   if(EXISTS ${THE_LIB})
     get_filename_component(THE_LIB_FILE_NAME ${THE_LIB} NAME_WE)
@@ -71,30 +69,7 @@ if(CYTHON_FOUND)
   endif (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.6.0)
 
   if(CGAL_FOUND)
-    # This is because of https://github.com/CGAL/cgal/blob/master/Installation/include/CGAL/tss.h
-    # CGAL is using boost thread if thread_local is not ready (requires XCode 8 for Mac).
-    # The test in https://github.com/CGAL/cgal/blob/master/Installation/include/CGAL/config.h
-    #   #if __has_feature(cxx_thread_local) || \
-    #       ( (__GNUC__ * 100 + __GNUC_MINOR__) >= 408 && __cplusplus >= 201103L ) || \
-    #       ( _MSC_VER >= 1900 )
-    #   #define CGAL_CAN_USE_CXX11_THREAD_LOCAL
-    #   #endif
-    set(CGAL_CAN_USE_CXX11_THREAD_LOCAL "
-        int main() {
-        #ifndef __has_feature
-          #define __has_feature(x) 0  // Compatibility with non-clang compilers.
-        #endif
-        #if __has_feature(cxx_thread_local) || \
-            ( (__GNUC__ * 100 + __GNUC_MINOR__) >= 408 && __cplusplus >= 201103L ) || \
-            ( _MSC_VER >= 1900 )
-          bool has_feature_thread_local = true;
-        #else
-          // Explicit error of compilation for CMake test purpose - has_feature_thread_local is not defined
-        #endif
-          bool result = has_feature_thread_local;
-        }  ")
-    check_cxx_source_compiles("${CGAL_CAN_USE_CXX11_THREAD_LOCAL}" CGAL_CAN_USE_CXX11_THREAD_LOCAL_RESULT)
-
+    can_cgal_use_cxx11_thread_local()
     if (NOT CGAL_CAN_USE_CXX11_THREAD_LOCAL_RESULT)
       add_gudhi_cython_lib(${Boost_THREAD_LIBRARY})
       set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${Boost_LIBRARY_DIRS}', ")
-- 
cgit v1.2.3