generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tbb search improvement

Browse Source
This commit is contained in:
Anatoly Baksheev 2011-04-01 19:19:03 +00:00
parent 535425982f
commit 7f77f8f35a
1 changed files with 37 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
CMakeLists.txt
View File

@ -616,27 +616,13 @@ if (WITH_TBB)
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")
@ -652,33 +638,19 @@ if (WITH_TBB)
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 x86_64*)
set(X86_64 1)
endif()
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES i686*)
set(X86 1)
endif()
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES i386*)
set(X86 1)
endif()
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES x86*)
set(X86 1)
endif()
set(_TBB_LIB_PATH "${TBB_INCLUDE_DIR}/../lib") if(${CMAKE_SYSTEM_PROCESSOR} MATCHES amd64*|x86_64*)
if (X86_64)
set(_TBB_LIB_PATH "${_TBB_LIB_PATH}/intel64") set(_TBB_LIB_PATH "${_TBB_LIB_PATH}/intel64")
elseif(X86) endif()
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES x86*|i386*|i686*)
set(_TBB_LIB_PATH "${_TBB_LIB_PATH}/ia32") set(_TBB_LIB_PATH "${_TBB_LIB_PATH}/ia32")
endif() endif()
if (MSVC80) if (MSVC80)
set(_TBB_LIB_PATH "${_TBB_LIB_PATH}/vc8") set(_TBB_LIB_PATH "${_TBB_LIB_PATH}/vc8")
elseif(MSVC90) elseif(MSVC90)
set(_TBB_LIB_PATH "${_TBB_LIB_PATH}/vc9") set(_TBB_LIB_PATH "${_TBB_LIB_PATH}/vc9")
endif()
elseif(MSVC10) elseif(MSVC10)
set(_TBB_LIB_PATH "${_TBB_LIB_PATH}/vc10") set(_TBB_LIB_PATH "${_TBB_LIB_PATH}/vc10")
endif() endif()
@ -693,7 +665,7 @@ if (WITH_TBB)
endif() endif()
endif() endif()
endif() endif()
#endif(WITH_TBB) endif(WITH_TBB)
############################ Intel IPP ############################# ############################ Intel IPP #############################