Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-08 21:33:55 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Cleanup logic surrounding the usage of vtkm thirdparty libraries

Browse Source
This commit is contained in:
Robert Maynard 2019-06-18 15:20:24 -04:00
parent 7454242e58
commit 9dc8b06dfb
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
vtkm/cont/CMakeLists.txt
View File

@ -188,7 +188,6 @@ add_subdirectory(openmp)
add_subdirectory(cuda)
set(backends )
set (DL_LIBS )
if(TARGET vtkm::tbb)
list(APPEND backends vtkm::tbb)
endif()
@ -198,15 +197,9 @@ endif()
if(TARGET vtkm::openmp)
list(APPEND backends vtkm::openmp)
endif()
if (VTKm_ENABLE_LOGGING)
list(APPEND DL_LIBS ${CMAKE_DL_LIBS} Threads::Threads) # dladdr function
endif()
target_link_libraries(vtkm_cont PUBLIC vtkm_compiler_flags ${backends} ${DL_LIBS})
target_link_libraries(vtkm_cont PUBLIC vtkm_taotuple vtkm_optionparser)
if(TARGET vtkm_diy)
# This will become a required dependency eventually.
target_link_libraries(vtkm_cont PUBLIC vtkm_diy)
endif()
target_link_libraries(vtkm_cont PUBLIC vtkm_compiler_flags ${backends})
target_link_libraries(vtkm_cont PUBLIC vtkm_taotuple vtkm_optionparser vtkm_diy)
#-----------------------------------------------------------------------------
add_subdirectory(testing)

2
vtkm/thirdparty/loguru/CMakeLists.txt vendored
View File

@ -18,6 +18,8 @@ target_include_directories(vtkm_loguru INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<INSTALL_INTERFACE:${VTKm_INSTALL_INCLUDE_DIR}/vtkm/thirdparty/loguru>)
target_link_libraries(vtkm_loguru INTERFACE ${CMAKE_DL_LIBS} Threads::Threads)
install(TARGETS vtkm_loguru
EXPORT ${VTKm_EXPORT_NAME})