Skip to content

O
opencv
Commit 7f77f8f3 authored by Anatoly Baksheev's avatar Anatoly Baksheev
Browse files
Options

tbb search improvement

parent 53542598
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 67 deletions
CMakeLists.txt
View file @ 7f77f8f3
...@@ -615,28 +615,14 @@ if (WITH_TBB) ...@@ -615,28 +615,14 @@ if (WITH_TBB)
include_directories(${TBB_INCLUDE_DIRS}) include_directories(${TBB_INCLUDE_DIRS})
endif() endif()
link_directories(${TBB_LIBRARY_DIRS}) link_directories(${TBB_LIBRARY_DIRS})
set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} ${TBB_LIBRARIES}) set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} ${TBB_LIBRARIES})
else()
set(TBB_DEFAULT_INCLUDE_DIRS
"/opt/intel/tbb"
"/usr/local/include"
"/usr/include")
endif() endif()
endif() endif()
if (APPLE)
set(TBB_DEFAULT_INCLUDE_DIRS
"/usr/local/include"
"/usr/include")
endif()
if (WIN32)
set(TBB_DEFAULT_INCLUDE_DIRS
"C:/Program Files/Intel/TBB"
"C:/Program Files (x86)/Intel/TBB")
endif()
if (NOT HAVE_TBB) if (NOT HAVE_TBB)
find_path(TBB_INCLUDE_DIR "tbb/tbb.h" set(TBB_DEFAULT_INCLUDE_DIRS "/opt/intel/tbb" "/usr/local/include" "/usr/include" "C:/Program Files/Intel/TBB" "C:/Program Files (x86)/Intel/TBB")
PATHS TBB_DEFAULT_INCLUDE_DIRS
DOC "The path to TBB headers") find_path(TBB_INCLUDE_DIR "tbb/tbb.h" PATHS ${TBB_DEFAULT_INCLUDE_DIRS} DOC "The path to TBB headers")
if (TBB_INCLUDE_DIR) if (TBB_INCLUDE_DIR)
if (UNIX) if (UNIX)
set(TBB_LIB_DIR "${TBB_INCLUDE_DIR}/../lib" CACHE PATH "Full path of TBB library directory") set(TBB_LIB_DIR "${TBB_INCLUDE_DIR}/../lib" CACHE PATH "Full path of TBB library directory")
...@@ -647,53 +633,39 @@ if (WITH_TBB) ...@@ -647,53 +633,39 @@ if (WITH_TBB)
elseif (UNIX) elseif (UNIX)
set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} tbb) set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} tbb)
elseif (WIN32) elseif (WIN32)
if (CMAKE_COMPILER_IS_GNUCXX) if (CMAKE_COMPILER_IS_GNUCXX)
set(TBB_LIB_DIR "${TBB_INCLUDE_DIR}/../lib" CACHE PATH "Full path of TBB library directory") set(TBB_LIB_DIR "${TBB_INCLUDE_DIR}/../lib" CACHE PATH "Full path of TBB library directory")
link_directories("${TBB_LIB_DIR}") link_directories("${TBB_LIB_DIR}")
set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} tbb) set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} tbb)
else() else()
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES amd64*) get_filename_component(_TBB_LIB_PATH "${TBB_INCLUDE_DIR}/../lib" ABSOLUTE)
set(X86_64 1)
endif() if(${CMAKE_SYSTEM_PROCESSOR} MATCHES amd64*|x86_64*)
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES x86_64*) set(_TBB_LIB_PATH "${_TBB_LIB_PATH}/intel64")
set(X86_64 1) endif()
endif() if(${CMAKE_SYSTEM_PROCESSOR} MATCHES x86*|i386*|i686*)
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES i686*) set(_TBB_LIB_PATH "${_TBB_LIB_PATH}/ia32")
set(X86 1) endif()
endif()
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES i386*) if (MSVC80)
set(X86 1) set(_TBB_LIB_PATH "${_TBB_LIB_PATH}/vc8")
endif() elseif(MSVC90)
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES x86*) set(_TBB_LIB_PATH "${_TBB_LIB_PATH}/vc9")
set(X86 1) elseif(MSVC10)
endif() set(_TBB_LIB_PATH "${_TBB_LIB_PATH}/vc10")
endif()
set(_TBB_LIB_PATH "${TBB_INCLUDE_DIR}/../lib") set(TBB_LIB_DIR "${_TBB_LIB_PATH}" CACHE PATH "Full path of TBB library directory")
if (X86_64) link_directories("${TBB_LIB_DIR}")
set(_TBB_LIB_PATH "${_TBB_LIB_PATH}/intel64") endif()
elseif(X86) endif()
set(_TBB_LIB_PATH "${_TBB_LIB_PATH}/ia32")
endif() set(HAVE_TBB 1)
if (MSVC80) if(NOT "${TBB_INCLUDE_DIR}" STREQUAL "")
set(_TBB_LIB_PATH "${_TBB_LIB_PATH}/vc8") include_directories("${TBB_INCLUDE_DIR}")
elseif(MSVC90) endif()
set(_TBB_LIB_PATH "${_TBB_LIB_PATH}/vc9") endif()
endif() endif()
elseif(MSVC10) endif(WITH_TBB)
set(_TBB_LIB_PATH "${_TBB_LIB_PATH}/vc10")
endif()
set(TBB_LIB_DIR "${_TBB_LIB_PATH}" CACHE PATH "Full path of TBB library directory")
link_directories("${TBB_LIB_DIR}")
endif()
endif()
set(HAVE_TBB 1)
if(NOT "${TBB_INCLUDE_DIR}" STREQUAL "")
include_directories("${TBB_INCLUDE_DIR}")
endif()
endif()
endif()
#endif(WITH_TBB)
############################ Intel IPP ############################# ############################ Intel IPP #############################
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment