Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//scalfmm/scalfmm

CMakeLists.txt

@@ -157,8 +157,13 @@ endif(ScalFMM_USE_BLAS)
 # C++ 2011
 #ADD_DEFINITIONS(-std=c++11)
 IF(CMAKE_CXX_COMPILER_ID STREQUAL "Intel" AND APPLE)
-  SET(SCALFMM_LIBRARIES "${SCALFMM_LIBRARIES} -stdlib=libc++")
-  SET(ScaLFMM_CXX_FLAGS "${ScaLFMM_CXX_FLAGS} -stdlib=libc++")
+  execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE INTEL_VERSION)
+#  MESSAGE( "CMAKE_SYSTEM:   ${CMAKE_SYSTEM}  ${CMAKE_SYSTEM_NAME} ${CMAKE_SYSTEM_VERSION}")
+#  MESSAGE( "Intel:   ${INTEL_VERSION}")
+  if( ${CMAKE_SYSTEM_VERSION} EQUAL 13 AND  ${INTEL_VERSION} GREATER 13.0 )
+    SET(SCALFMM_LIBRARIES "${SCALFMM_LIBRARIES} -stdlib=libc++")
+    SET(ScaLFMM_CXX_FLAGS "${ScaLFMM_CXX_FLAGS} -stdlib=libc++")
+  endif()
 endif()
 
 CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/Src/ScalFmmConfig.h.cmake