Search paths provided by intel's "tbbvars.sh".

Summary:
TBBROOT and LIBRARY_PATH are set in env by the script.

With TBB 2018 the library path is $TBBROOT/lib/intel64/gcc4.7 for anything above gcc 4.7, which is both compiler and architecture related. We cannot simply do ${TBB_ROOT_DIR}/lib.
Closes https://github.com/facebook/rocksdb/pull/3815

Differential Revision: D7899006

Pulled By: ajkr

fbshipit-source-id: 159ab1f6a5c40452ed6aa8d79300206953d916c2
main
Tongliang Liao 7 years ago committed by Facebook Github Bot
parent d72a51e9e1
commit 6d6e01cdbc
  1. 6
      cmake/modules/FindTBB.cmake

@ -5,13 +5,17 @@
# TBB_LIBRARIES - List of libraries when using TBB. # TBB_LIBRARIES - List of libraries when using TBB.
# TBB_FOUND - True if TBB found. # TBB_FOUND - True if TBB found.
if(NOT DEFINED TBB_ROOT_DIR)
set(TBB_ROOT_DIR "$ENV{TBBROOT}")
endif()
find_path(TBB_INCLUDE_DIR find_path(TBB_INCLUDE_DIR
NAMES tbb/tbb.h NAMES tbb/tbb.h
HINTS ${TBB_ROOT_DIR}/include) HINTS ${TBB_ROOT_DIR}/include)
find_library(TBB_LIBRARIES find_library(TBB_LIBRARIES
NAMES tbb NAMES tbb
HINTS ${TBB_ROOT_DIR}/lib) HINTS ${TBB_ROOT_DIR}/lib ENV LIBRARY_PATH)
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(TBB DEFAULT_MSG TBB_LIBRARIES TBB_INCLUDE_DIR) find_package_handle_standard_args(TBB DEFAULT_MSG TBB_LIBRARIES TBB_INCLUDE_DIR)

Loading…
Cancel
Save