X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=adm_local%2Fcmake_files%2FFindTBB.cmake;h=91142c02f4adb4fb5cf2d1dbf47d4db4e2184a29;hp=86251788bd30c4c6da0acc09ead816af1d54220d;hb=6bac08c1a81f34d3f21c550bd92f83654b2546a5;hpb=1bd4ba8acdfe7ab1edc96a016836e174a393d445

diff --git a/adm_local/cmake_files/FindTBB.cmake b/adm_local/cmake_files/FindTBB.cmake
index 86251788b..91142c02f 100644
--- 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-2015  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,18 +39,16 @@ 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}")
+FIND_LIBRARY(TBB_LIBRARY_tbb NAMES tbb PATH_SUFFIXES lib/${PLT_SUFFIX}/cc4.1.0_libc2.4_kernel2.6.16.21 lib/${PLT_SUFFIX}/gcc4.4)
+FIND_LIBRARY(TBB_LIBRATY_tbbmalloc NAMES tbbmalloc PATH_SUFFIXES lib/${PLT_SUFFIX}/cc4.1.0_libc2.4_kernel2.6.16.21 lib/${PLT_SUFFIX}/gcc4.4)
 
 SET(TBB_LIBRARIES
   ${TBB_LIBRARY_tbb}
@@ -58,4 +56,4 @@ SET(TBB_LIBRARIES
 )
 
 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_LIBRATY_tbbmalloc)