mirror of https://github.com/CGAL/cgal
Reintroduce a search in NO_MODULE mode
This commit is contained in:
parent
44a7b6a431
commit
c02bd3cbd5
|
|
@ -195,6 +195,25 @@ endmacro()
|
||||||
# Get path, convert backslashes as ${ENV_${var}}
|
# Get path, convert backslashes as ${ENV_${var}}
|
||||||
getenv_path(TBB_ROOT)
|
getenv_path(TBB_ROOT)
|
||||||
|
|
||||||
|
#start with looking for TBB_DIR and TBB_ROOT
|
||||||
|
if((TBB_ROOT OR "$ENV{TBB_ROOT}" OR "$ENV{TBB_DIR}" ) AND NOT TBB_FOUND)
|
||||||
|
find_package(TBB QUIET NO_MODULE NO_CMAKE_SYSTEM_PATH NO_SYSTEM_ENVIRONMENT_PATH)
|
||||||
|
endif()
|
||||||
|
if(TBB_FOUND)
|
||||||
|
return()
|
||||||
|
endif()#TBB_FOUND
|
||||||
|
|
||||||
|
#try CONFIG Mode
|
||||||
|
find_package(TBB 2019.0.11005 QUIET NO_MODULE)
|
||||||
|
if(TBB_FOUND)
|
||||||
|
return()
|
||||||
|
endif()#TBB_FOUND
|
||||||
|
|
||||||
|
if(NOT ENV_TBB_ROOT)
|
||||||
|
getenv_path(TBBROOT)
|
||||||
|
set(ENV_TBB_ROOT ${ENV_TBBROOT})
|
||||||
|
endif()
|
||||||
|
|
||||||
# initialize search paths
|
# initialize search paths
|
||||||
set(TBB_PREFIX_PATH ${TBB_ROOT} ${ENV_TBB_ROOT})
|
set(TBB_PREFIX_PATH ${TBB_ROOT} ${ENV_TBB_ROOT})
|
||||||
set(TBB_INC_SEARCH_PATH "")
|
set(TBB_INC_SEARCH_PATH "")
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue