mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-09-19 02:25:42 +00:00
Add vtkm_taotuple to build system.
This commit is contained in:
parent
d23c445296
commit
193447078f
@ -146,7 +146,7 @@ int ${headername}_${headerextension}_testbuild_symbol;"
|
|||||||
set_property(TARGET TestBuild_${name} PROPERTY ARCHIVE_OUTPUT_DIRECTORY ${VTKm_LIBRARY_OUTPUT_PATH}/testbuilds)
|
set_property(TARGET TestBuild_${name} PROPERTY ARCHIVE_OUTPUT_DIRECTORY ${VTKm_LIBRARY_OUTPUT_PATH}/testbuilds)
|
||||||
set_property(TARGET TestBuild_${name} PROPERTY LIBRARY_OUTPUT_DIRECTORY ${VTKm_LIBRARY_OUTPUT_PATH}/testbuilds)
|
set_property(TARGET TestBuild_${name} PROPERTY LIBRARY_OUTPUT_DIRECTORY ${VTKm_LIBRARY_OUTPUT_PATH}/testbuilds)
|
||||||
|
|
||||||
target_link_libraries(TestBuild_${name} PRIVATE vtkm_compiler_flags)
|
target_link_libraries(TestBuild_${name} PRIVATE vtkm_compiler_flags vtkm_taotuple)
|
||||||
|
|
||||||
if(TARGET vtkm::tbb)
|
if(TARGET vtkm::tbb)
|
||||||
#make sure that we have the tbb include paths when tbb is enabled.
|
#make sure that we have the tbb include paths when tbb is enabled.
|
||||||
|
@ -68,6 +68,7 @@ vtkm_declare_headers(${headers})
|
|||||||
#-----------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------
|
||||||
#first add all the components vtkm that are shared between control and exec
|
#first add all the components vtkm that are shared between control and exec
|
||||||
add_subdirectory(thirdparty/diy)
|
add_subdirectory(thirdparty/diy)
|
||||||
|
add_subdirectory(thirdparty/taotuple)
|
||||||
add_subdirectory(testing)
|
add_subdirectory(testing)
|
||||||
add_subdirectory(internal)
|
add_subdirectory(internal)
|
||||||
|
|
||||||
|
@ -163,7 +163,7 @@ endif()
|
|||||||
target_link_libraries(vtkm_cont PUBLIC vtkm_compiler_flags ${backends})
|
target_link_libraries(vtkm_cont PUBLIC vtkm_compiler_flags ${backends})
|
||||||
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)
|
target_link_libraries(vtkm_cont PUBLIC vtkm_diy vtkm_taotuple)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
#-----------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------
|
||||||
|
2
vtkm/thirdparty/taotuple/CMakeLists.txt
vendored
2
vtkm/thirdparty/taotuple/CMakeLists.txt
vendored
@ -24,6 +24,8 @@ add_library(vtkm_taotuple INTERFACE)
|
|||||||
vtkm_get_kit_name(kit_name kit_dir)
|
vtkm_get_kit_name(kit_name kit_dir)
|
||||||
|
|
||||||
set(headers
|
set(headers
|
||||||
|
vtkmtaotuple/include/SimpleTuple.h
|
||||||
|
vtkmtaotuple/include/Tuple.h
|
||||||
vtkmtaotuple/include/tao/seq/concatenate.hpp
|
vtkmtaotuple/include/tao/seq/concatenate.hpp
|
||||||
vtkmtaotuple/include/tao/seq/config.hpp
|
vtkmtaotuple/include/tao/seq/config.hpp
|
||||||
vtkmtaotuple/include/tao/seq/exclusive_scan.hpp
|
vtkmtaotuple/include/tao/seq/exclusive_scan.hpp
|
||||||
|
Loading…
Reference in New Issue
Block a user