904e784e89
Years ago we discovered a problem with TBB's parallel sort, which we patch in our local repo and submitted a change to TBB, which has been accepted. The code to decide whether to use our parallel_sort patch does not work with the latest versions of TBB because it requires including a header that changed names to get the TBB version. We no longer support any TBB version with this bug, so just remove the patch from VTK-m.
42 lines
1.2 KiB
CMake
42 lines
1.2 KiB
CMake
##============================================================================
|
|
## Copyright (c) Kitware, Inc.
|
|
## All rights reserved.
|
|
## See LICENSE.txt for details.
|
|
##
|
|
## This software is distributed WITHOUT ANY WARRANTY; without even
|
|
## the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
|
## PURPOSE. See the above copyright notice for more information.
|
|
##============================================================================
|
|
|
|
set(headers
|
|
DeviceAdapterAlgorithmTBB.h
|
|
DeviceAdapterMemoryManagerTBB.h
|
|
DeviceAdapterRuntimeDetectorTBB.h
|
|
DeviceAdapterTagTBB.h
|
|
FunctorsTBB.h
|
|
ParallelSortTBB.h
|
|
)
|
|
|
|
if (NOT VTKm_NO_DEPRECATED_VIRTUAL)
|
|
set(headers ${headers}
|
|
VirtualObjectTransferTBB.h
|
|
)
|
|
endif()
|
|
|
|
vtkm_declare_headers(${headers}
|
|
ParallelSortTBB.hxx
|
|
)
|
|
|
|
#These sources need to always be built
|
|
target_sources(vtkm_cont PRIVATE
|
|
${CMAKE_CURRENT_SOURCE_DIR}/DeviceAdapterRuntimeDetectorTBB.cxx
|
|
)
|
|
|
|
#-----------------------------------------------------------------------------
|
|
if (TARGET vtkm::tbb)
|
|
target_sources(vtkm_cont PRIVATE
|
|
${CMAKE_CURRENT_SOURCE_DIR}/DeviceAdapterAlgorithmTBB.cxx
|
|
${CMAKE_CURRENT_SOURCE_DIR}/ParallelSortTBB.cxx
|
|
)
|
|
endif()
|