vtkm thirdparty includes are now usable from an installed vtk-m.

This commit is contained in:
Robert Maynard 2018-05-18 16:11:41 -04:00
parent 4a520b7bdd
commit 37c57ebb25
2 changed files with 3 additions and 33 deletions

@ -34,7 +34,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Configure.h.in
target_include_directories(vtkm_diy INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
$<INSTALL_INTERFACE:${VTKm_INSTALL_INCLUDE_DIR}>)
$<INSTALL_INTERFACE:${VTKm_INSTALL_INCLUDE_DIR}/vtkm/thirdparty/diy>)
if(VTKm_ENABLE_MPI)
set(arg)

@ -23,46 +23,16 @@ add_library(vtkm_taotuple INTERFACE)
vtkm_get_kit_name(kit_name kit_dir)
set(headers
vtkmtaotuple/include/SimpleTuple.h
vtkmtaotuple/include/Tuple.h
vtkmtaotuple/include/tao/seq/concatenate.hpp
vtkmtaotuple/include/tao/seq/config.hpp
vtkmtaotuple/include/tao/seq/exclusive_scan.hpp
vtkmtaotuple/include/tao/seq/fold.hpp
vtkmtaotuple/include/tao/seq/head.hpp
vtkmtaotuple/include/tao/seq/inclusive_scan.hpp
vtkmtaotuple/include/tao/seq/integer_sequence.hpp
vtkmtaotuple/include/tao/seq/is_all.hpp
vtkmtaotuple/include/tao/seq/is_any.hpp
vtkmtaotuple/include/tao/seq/make_integer_sequence.hpp
vtkmtaotuple/include/tao/seq/map.hpp
vtkmtaotuple/include/tao/seq/max.hpp
vtkmtaotuple/include/tao/seq/min.hpp
vtkmtaotuple/include/tao/seq/minus.hpp
vtkmtaotuple/include/tao/seq/partial_sum.hpp
vtkmtaotuple/include/tao/seq/plus.hpp
vtkmtaotuple/include/tao/seq/select.hpp
vtkmtaotuple/include/tao/seq/sum.hpp
vtkmtaotuple/include/tao/seq/tail.hpp
vtkmtaotuple/include/tao/seq/type_by_index.hpp
vtkmtaotuple/include/tao/seq/values.hpp
vtkmtaotuple/include/tao/seq/zip.hpp
vtkmtaotuple/include/tao/tuple/tuple.hpp
)
vtkm_declare_headers(EXCLUDE_FROM_TESTING ${headers})
# taotuple needs C++11
target_compile_features(vtkm_taotuple INTERFACE cxx_auto_type)
target_include_directories(vtkm_taotuple INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<INSTALL_INTERFACE:${VTKm_INSTALL_INCLUDE_DIR}>)
$<INSTALL_INTERFACE:${VTKm_INSTALL_INCLUDE_DIR}/vtkm/thirdparty/taotuple>)
install(TARGETS vtkm_taotuple
EXPORT ${VTKm_EXPORT_NAME})
## Install headers
install(DIRECTORY vtkmtaotuple/include/
install(DIRECTORY vtkmtaotuple
DESTINATION ${VTKm_INSTALL_INCLUDE_DIR}/${kit_dir}/)