X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=adm_local%2Fcmake_files%2FFindTBB.cmake;h=c73d6569e822c1a7f8b5086e19b8567c539d482b;hb=306534b9d78ada7069c49299277ae618fac77e35;hp=2fa30c576d71309010c0bd4ebfc158aab3fa6b4e;hpb=b0a908c0d20341651771d0249fb10882f54b2aad;p=modules%2Fsmesh.git diff --git a/adm_local/cmake_files/FindTBB.cmake b/adm_local/cmake_files/FindTBB.cmake index 2fa30c576..c73d6569e 100644 --- a/adm_local/cmake_files/FindTBB.cmake +++ b/adm_local/cmake_files/FindTBB.cmake @@ -41,16 +41,14 @@ ENDIF(TBB_ROOT_DIR) FIND_PATH(TBB_INCLUDE_DIRS tbb/tbb.h PATH_SUFFIXES include) -SET(TBBKERNEL cc4.1.0_libc2.4_kernel2.6.16.21) - 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}