Skip to content

Commit

Permalink
BUG: Do not have a FATAL_ERROR from config checking
Browse files Browse the repository at this point in the history
The FATAL_ERROR causes the un-recoverable failure on testing.

find_packaging(TBB QUIET) should be allowed to fail.  If a component
is missing that was requested, a non-terminating exit is needed.
  • Loading branch information
hjmjohnson committed Jan 19, 2019
1 parent 3147923 commit 010ae25
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion cmake/templates/TBBConfig.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,12 @@ foreach (_tbb_component ${TBB_FIND_COMPONENTS})
list(APPEND TBB_IMPORTED_TARGETS TBB::${_tbb_component})
set(TBB_${_tbb_component}_FOUND 1)
elseif (TBB_FIND_REQUIRED AND TBB_FIND_REQUIRED_${_tbb_component})
message(FATAL_ERROR "Missed required Intel TBB component: ${_tbb_component}")
message(STATUS "Missed required Intel TBB component: ${_tbb_component}")
# Do not use FATAL_ERROR message as that
# breaks find_package(TBB QUIET) behavior
set(TBB_FOUND FALSE) # Set TBB_FOUND considered to be NOT FOUND if
# required components missing
set(TBB_${_tbb_component}_FOUND 0)
endif()
endforeach()

Expand Down

0 comments on commit 010ae25

Please sign in to comment.