Merge remote branch 'origin/V7_dev' into V7_dev

[modules/smesh.git] / adm_local / cmake_files / FindTBB.cmake

diff --git a/adm_local/cmake_files/FindTBB.cmake b/adm_local/cmake_files/FindTBB.cmake
index 86251788bd30c4c6da0acc09ead816af1d54220d..0f4077fa798b28677d1c020810615c2085d21a1b 100644 (file)
--- a/adm_local/cmake_files/FindTBB.cmake
+++ b/adm_local/cmake_files/FindTBB.cmake
@@ -5,7 +5,7 @@
 #
 
 #########################################################################
-# Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -13,7 +13,7 @@
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -39,23 +39,67 @@ IF(TBB_ROOT_DIR)
   LIST(APPEND CMAKE_PREFIX_PATH "${TBB_ROOT_DIR}")
 ENDIF(TBB_ROOT_DIR)
 
-FIND_PATH(TBB_INCLUDE_DIRS tbb.h PATH_SUFFIXES "include/tbb")
-
-SET(TBBKERNEL cc4.1.0_libc2.4_kernel2.6.16.21)
+FIND_PATH(TBB_INCLUDE_DIRS tbb/tbb.h PATH_SUFFIXES include)
 
 IF(MACHINE_IS_64)
-  SET(LIB_SUFFIX lib/intel64/${TBBKERNEL})
+  SET(PLT_SUFFIX intel64)
 ELSE(MACHINE_IS_64)
-  SET(LIB_SUFFIX lib/ia32/${TBBKERNEL})
+  SET(PLT_SUFFIX ia32)
 ENDIF(MACHINE_IS_64)
 
-FIND_LIBRARY(TBB_LIBRARY_tbb NAMES tbb PATH_SUFFIXES "${LIB_SUFFIX}")
-FIND_LIBRARY(TBB_LIBRATY_tbbmalloc NAMES tbbmalloc PATH_SUFFIXES "${LIB_SUFFIX}")
+include(CheckCXXSourceCompiles)
+
+FOREACH(_kernel cc4.1.0_libc2.4_kernel2.6.16.21 gcc4.4 gcc4.1)
+
+  FIND_LIBRARY(_tbb_library_tbb${_kernel}       NAMES tbb       PATH_SUFFIXES lib/${PLT_SUFFIX}/${_kernel})
+  FIND_LIBRARY(_tbb_library_tbbmalloc${_kernel} NAMES tbbmalloc PATH_SUFFIXES lib/${PLT_SUFFIX}/${_kernel})
+
+  SET(_tbb_libraries${_kernel} ${_tbb_library_tbb${_kernel}} ${_tbb_library_tbbmalloc${_kernel}})
+
+  IF(_tbb_libraries${_kernel})
+
+    SET(CMAKE_REQUIRED_INCLUDES_SAVE  ${CMAKE_REQUIRED_INCLUDES})
+    SET(CMAKE_REQUIRED_LIBRARIES_SAVE ${CMAKE_REQUIRED_LIBRARIES})
+    SET(CMAKE_REQUIRED_INCLUDES  "${CMAKE_REQUIRED_INCLUDES} ${TBB_INCLUDE_DIRS}")
+    SET(CMAKE_REQUIRED_LIBRARIES "${_tbb_libraries${_kernel}}")
+
+    CHECK_CXX_SOURCE_COMPILES("
+      #include <tbb/tbb.h>
+      using namespace tbb;
+      size_t testme(size_t n)
+      {
+        return n*n;
+      }
+      int main(int argc, char* argv[])
+      {
+        parallel_for<size_t>( 1, 10, 1, testme );
+      }
+      "
+      _tbb_link_ok${_kernel}
+      )
+    
+    SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES_SAVE})
+    SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES_SAVE})
+
+    IF(_tbb_link_ok${_kernel})
+      SET(_tbb_link_ok ${_tbb_link_ok${_kernel}})
+      SET(TBB_LIBRARY_tbb       ${_tbb_library_tbb${_kernel}}       CACHE FILEPATH "Path to a library")
+      SET(TBB_LIBRARY_tbbmalloc ${_tbb_library_tbbmalloc${_kernel}} CACHE FILEPATH "Path to a library")
+      SET(TBB_LIBRARIES ${TBB_LIBRARY_tbb} ${TBB_LIBRARY_tbbmalloc})
+    ENDIF()
+
+    UNSET(_tbb_link_ok${_kernel} CACHE)
+
+  ENDIF(_tbb_libraries${_kernel})
+
+  UNSET(_tbb_library_tbb${_kernel} CACHE)
+  UNSET(_tbb_library_tbbmalloc${_kernel} CACHE)
+
+  IF(_tbb_link_ok)
+    BREAK()
+  ENDIF()
 
-SET(TBB_LIBRARIES
-  ${TBB_LIBRARY_tbb}
-  ${TBB_LIBRATY_tbbmalloc}
-)
+ENDFOREACH()
 
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(TBB REQUIRED_VARS TBB_INCLUDE_DIRS TBB_LIBRARY_tbb TBB_LIBRATY_tbbmalloc)
\ No newline at end of file
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(TBB REQUIRED_VARS TBB_INCLUDE_DIRS TBB_LIBRARY_tbb TBB_LIBRARY_tbbmalloc)