Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion cmake/modules/clang.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,10 @@ if(enable-parallel-stl-algorithms)
# This is a poor test to check of libstc++ is used
if(UNIX AND NOT APPLE)
if(NOT enable-libcxx)
find_package(TBB REQUIRED)
find_package(TBB)
if(NOT TBB_FOUND)
message(FATAL_ERROR "Intel Threading Building Blocks library (TBB) is required by libstdc++ to support parallel STL algorithms. You may want to disable support for those parallel algorithms by passing -Denable-parallel-stl-algorithms=OFF to cmake")
endif(NOT TBB_FOUND)
list(APPEND MGIS_REQUIRED_ADDITIONAL_PACKAGES "TBB")
list(APPEND MGIS_ADDITIONAL_LIBRARIES "TBB::tbb")
endif(NOT enable-libcxx)
Expand Down
5 changes: 4 additions & 1 deletion cmake/modules/gcc.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,10 @@ endif(enable-sanitize-options)
set(COMPILER_C_WARNINGS "-Wall -W -pedantic")

if(enable-parallel-stl-algorithms)
find_package(TBB REQUIRED)
find_package(TBB)
if(NOT TBB_FOUND)
message(FATAL_ERROR "Intel Threading Building Blocks library (TBB) is required by libstdc++ to support parallel STL algorithms. You may want to disable support for those parallel algorithms by passing -Denable-parallel-stl-algorithms=OFF to cmake")
endif(NOT TBB_FOUND)
list(APPEND MGIS_REQUIRED_ADDITIONAL_PACKAGES "TBB")
list(APPEND MGIS_ADDITIONAL_LIBRARIES "TBB::tbb")
endif(enable-parallel-stl-algorithms)
Expand Down