Revert "Disable loading the TBBConfig.cmake file"
This reverts commit a8825db59a7235c9d267ac4f909bd2eebb25cb40.
This commit is contained in:
parent
dd3fc97811
commit
c30c35571f
@ -70,32 +70,29 @@
|
|||||||
|
|
||||||
# Use TBBConfig.cmake if possible.
|
# Use TBBConfig.cmake if possible.
|
||||||
|
|
||||||
# Disabling this as it running the TBBConfig.cmake on dragnipur is
|
set(_tbb_find_quiet)
|
||||||
# causing a CMake error. I don't know if this is an install problem
|
if (TBB_FIND_QUIETLY)
|
||||||
# or an issue with version 2018.0.
|
set(_tbb_find_quiet QUIET)
|
||||||
# set(_tbb_find_quiet)
|
endif ()
|
||||||
# if (TBB_FIND_QUIETLY)
|
set(_tbb_find_components)
|
||||||
# set(_tbb_find_quiet QUIET)
|
set(_tbb_find_optional_components)
|
||||||
# endif ()
|
foreach (_tbb_find_component IN LISTS TBB_FIND_COMPONENTS)
|
||||||
# set(_tbb_find_components)
|
if (TBB_FIND_REQUIRED_${_tbb_find_component})
|
||||||
# set(_tbb_find_optional_components)
|
list(APPEND _tbb_find_components "${_tbb_find_component}")
|
||||||
# foreach (_tbb_find_component IN LISTS TBB_FIND_COMPONENTS)
|
else ()
|
||||||
# if (TBB_FIND_REQUIRED_${_tbb_find_component})
|
list(APPEND _tbb_find_optional_components "${_tbb_find_component}")
|
||||||
# list(APPEND _tbb_find_components "${_tbb_find_component}")
|
endif ()
|
||||||
# else ()
|
endforeach ()
|
||||||
# list(APPEND _tbb_find_optional_components "${_tbb_find_component}")
|
unset(_tbb_find_component)
|
||||||
# endif ()
|
find_package(TBB CONFIG ${_tbb_find_quiet}
|
||||||
# endforeach ()
|
COMPONENTS ${_tbb_find_components}
|
||||||
# unset(_tbb_find_component)
|
OPTIONAL_COMPONENTS ${_tbb_find_optional_components})
|
||||||
# find_package(TBB CONFIG ${_tbb_find_quiet}
|
unset(_tbb_find_quiet)
|
||||||
# COMPONENTS ${_tbb_find_components}
|
unset(_tbb_find_components)
|
||||||
# OPTIONAL_COMPONENTS ${_tbb_find_optional_components})
|
unset(_tbb_find_optional_components)
|
||||||
# unset(_tbb_find_quiet)
|
if (TBB_FOUND)
|
||||||
# unset(_tbb_find_components)
|
return ()
|
||||||
# unset(_tbb_find_optional_components)
|
endif ()
|
||||||
# if (TBB_FOUND)
|
|
||||||
# return ()
|
|
||||||
# endif ()
|
|
||||||
|
|
||||||
#====================================================
|
#====================================================
|
||||||
# Fix the library path in case it is a linker script
|
# Fix the library path in case it is a linker script
|
||||||
|
Loading…
Reference in New Issue
Block a user