Updates will be applied - 3:30pm EDT (UTC -400). No downtime expected.

Commit 8a9b68b3 authored by Dave DeMarle's avatar Dave DeMarle

Merge branch 'fix-smp-tbb-debug-configuration' into release

Change-Id: Iace4db583c9d12394d763d1c4c99f4e1cddb37d1
parents 16135015 0dceda00
......@@ -40,7 +40,13 @@ endif()
if ("${VTK_SMP_IMPLEMENTATION_TYPE}" STREQUAL "TBB")
find_package(TBB REQUIRED)
set(VTK_SMP_IMPLEMENTATION_LIBRARIES ${TBB_LIBRARY})
set(VTK_SMP_IMPLEMENTATION_LIBRARIES "")
if (TBB_LIBRARY)
list(APPEND VTK_SMP_IMPLEMENTATION_LIBRARIES optimized ${TBB_LIBRARY})
endif()
if (TBB_LIBRARY_DEBUG)
list(APPEND VTK_SMP_IMPLEMENTATION_LIBRARIES debug ${TBB_LIBRARY_DEBUG})
endif()
set(VTK_SMP_ATOMIC_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/SMP/TBB")
include_directories(${TBB_INCLUDE_DIRS})
# This needs to be here because all modules that include vtkAtomic.h
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment