Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-19 18:45:43 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge topic 'fix-missing-symbol-dladdr'

Browse Source 
9bd30571f Fix link errors for vtkm_cont when logging is enabled

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1461
This commit is contained in:
Haocheng LIU 2018-11-27 19:28:45 +00:00 committed by Kitware Robot
commit 0a4b74b78b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vtkm/cont/CMakeLists.txt
View File

@ -175,6 +175,7 @@ add_subdirectory(openmp)
add_subdirectory(cuda) add_subdirectory(cuda)
set(backends ) set(backends )
set (DL_LIBS )
if(TARGET vtkm::tbb) if(TARGET vtkm::tbb)
list(APPEND backends vtkm::tbb) list(APPEND backends vtkm::tbb)
endif() endif()
@ -184,7 +185,10 @@ endif()
if(TARGET vtkm::openmp) if(TARGET vtkm::openmp)
list(APPEND backends vtkm::openmp) list(APPEND backends vtkm::openmp)
endif() endif()
target_link_libraries(vtkm_cont PUBLIC vtkm_compiler_flags ${backends}) if (VTKm_ENABLE_LOGGING)
list(APPEND DL_LIBS ${CMAKE_DL_LIBS}) # dladdr function
endif()
target_link_libraries(vtkm_cont PUBLIC vtkm_compiler_flags ${backends} ${DL_LIBS})
if(TARGET vtkm_diy) if(TARGET vtkm_diy)
# This will become a required dependency eventually. # This will become a required dependency eventually.
target_link_libraries(vtkm_cont PUBLIC vtkm_diy vtkm_taotuple) target_link_libraries(vtkm_cont PUBLIC vtkm_diy vtkm_taotuple)