2.12.2021, 9:00 - 11:00: Due to updates GitLab may be unavailable for some minutes between 09:00 and 11:00.

Commit 505b37e3 authored by Christian Schulte zu Berge's avatar Christian Schulte zu Berge
Browse files

tweaking FindTBB CMake file

parent 37610ec6
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
IF (WIN32) IF (WIN32)
MESSAGE(STATUS ${TbbDirectory}) MESSAGE(STATUS ${TbbDirectory})
IF(NOT TbbDirectory) IF(NOT TBB_ROOT)
# check environment variables # check environment variables
IF(NOT "$ENV{TBB_INSTALL_DIR}" STREQUAL "") IF(NOT "$ENV{TBB_INSTALL_DIR}" STREQUAL "")
SET(TbbDirectory $ENV{TBB_INSTALL_DIR}) SET(TbbDirectory $ENV{TBB_INSTALL_DIR})
...@@ -17,12 +17,18 @@ IF (WIN32) ...@@ -17,12 +17,18 @@ IF (WIN32)
# check default install directory # check default install directory
set(_TbbSeachPaths "C:/Program Files/Intel/TBB" "C:/Program Files (x86)/Intel/TBB" "${CampvisHome}/ext/tbb") set(_TbbSeachPaths "C:/Program Files/Intel/TBB" "C:/Program Files (x86)/Intel/TBB" "${CampvisHome}/ext/tbb")
FIND_PATH( FIND_PATH(
TbbDirectory TBB_ROOT
NAMES include/tbb/tbb.h NAMES include/tbb/tbb.h
PATHS ${_TbbSeachPaths} PATHS ${_TbbSeachPaths}
DOC "Intel TBB directory with includes, libs and dlls (i.e. where you extracted the binary distribution from threadingbuildingblocks.org.)" DOC "Intel TBB directory with includes, libs and dlls (i.e. where you extracted the binary distribution from threadingbuildingblocks.org.)"
) )
IF(NOT TBB_ROOT)
MESSAGE(FATAL_ERROR "Could not find Intel TBB. Please set TBB_ROOT to the Intel TBB directory with includes, libs and dlls (i.e. where you extracted the binary distribution from threadingbuildingblocks.org.)")
ENDIF()
ENDIF() ENDIF()
SET(TbbDirectory ${TBB_ROOT})
IF(CAMPVIS_MSVC2010) IF(CAMPVIS_MSVC2010)
SET(TbbCompilerDirectory "vc10") SET(TbbCompilerDirectory "vc10")
...@@ -79,9 +85,6 @@ ELSE (WIN32) ...@@ -79,9 +85,6 @@ ELSE (WIN32)
) )
ENDIF (WIN32) ENDIF (WIN32)
MESSAGE(STATUS ${TBB_INCLUDE_DIR})
MESSAGE(STATUS ${TBB_LIBRARY})
IF(TBB_INCLUDE_DIR AND TBB_LIBRARY) IF(TBB_INCLUDE_DIR AND TBB_LIBRARY)
SET(TBB_FOUND TRUE) SET(TBB_FOUND TRUE)
ELSE(TBB_INCLUDE_DIR AND TBB_LIBRARY) ELSE(TBB_INCLUDE_DIR AND TBB_LIBRARY)
......
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