ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-26 01:10:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

Change a way TBB libraries are searched to make it working with tbb v4.

Browse Source
This commit is contained in:
vsr 2015-01-27 11:57:09 +03:00
parent b13aae09cf
commit a2204af929
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
adm_local/cmake_files/FindTBB.cmake
View File

@ -41,16 +41,14 @@ ENDIF(TBB_ROOT_DIR)
FIND_PATH(TBB_INCLUDE_DIRS tbb/tbb.h PATH_SUFFIXES include) 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) IF(MACHINE_IS_64)
SET(LIB_SUFFIX lib/intel64/${TBBKERNEL}) SET(PLT_SUFFIX intel64)
ELSE(MACHINE_IS_64) ELSE(MACHINE_IS_64)
SET(LIB_SUFFIX lib/ia32/${TBBKERNEL}) SET(PLT_SUFFIX ia32)
ENDIF(MACHINE_IS_64) ENDIF(MACHINE_IS_64)
FIND_LIBRARY(TBB_LIBRARY_tbb NAMES tbb 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_SUFFIX}") 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 SET(TBB_LIBRARIES
${TBB_LIBRARY_tbb} ${TBB_LIBRARY_tbb}