AuroraMiddleware/OpenSubdiv
1
0
Fork 0
mirror of https://github.com/PixarAnimationStudios/OpenSubdiv synced 2024-09-19 22:30:05 +00:00
Code Issues Releases Wiki Activity

Fix incorrect TBB path resolution order.

Browse Source 
When two instances of TBB were present, the system installed version would take
precedence over an explicitly specified TBB_LOCATION path. This change puts
TBB_LOCATION into the HINTS section and leaves the system paths in the PATHS
section.
This commit is contained in:
jcowles 2015-03-31 15:09:14 -07:00
parent 76efdcfcf7
commit d758d572f7
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/FindTBB.cmake
View File

@ -37,6 +37,7 @@ if (WIN32)
HINTS
"${TBB_LOCATION}/include"
"$ENV{TBB_LOCATION}/include"
PATHS
"$ENV{PROGRAMFILES}/Intel/TBB/include"
/usr/include
DOC "The directory where TBB headers reside")
@ -47,6 +48,7 @@ elseif (APPLE)
HINTS
"${TBB_LOCATION}/include"
"$ENV{TBB_LOCATION}/include"
PATHS
DOC "The directory where TBB headers reside")
else ()
find_path(TBB_INCLUDE_DIR
@ -55,6 +57,7 @@ else ()
HINTS
"${TBB_LOCATION}/include"
"$ENV{TBB_LOCATION}/include"
PATHS
/usr/include
/usr/local/include
/usr/openwin/share/include