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

Merge topic 'correct_improper_thirdparty_include_paths'

Browse Source 
d9af7649 thirdparty libraries now obey VTKm_INSTALL_ONLY_LIBRARIES
37c57ebb vtkm thirdparty includes are now usable from an installed vtk-m.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1216
This commit is contained in:
Robert Maynard 2018-05-19 13:12:10 +00:00 committed by Kitware Robot
commit 7836fff251
2 changed files with 8 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vtkm/thirdparty/diy/CMakeLists.txt vendored
View File

@ -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)
@ -60,7 +60,9 @@ install(TARGETS vtkm_diy
EXPORT ${VTKm_EXPORT_NAME})
## Install headers
if(NOT VTKm_INSTALL_ONLY_LIBRARIES)
install(DIRECTORY vtkmdiy
DESTINATION ${VTKm_INSTALL_INCLUDE_DIR}/${kit_dir}/)
install(FILES ${VTKm_BINARY_INCLUDE_DIR}/${kit_dir}/Configure.h
DESTINATION ${VTKm_INSTALL_INCLUDE_DIR}/${kit_dir}/)
endif()

38
vtkm/thirdparty/taotuple/CMakeLists.txt vendored
View File

@ -23,46 +23,18 @@ 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/
DESTINATION ${VTKm_INSTALL_INCLUDE_DIR}/${kit_dir}/)
if(NOT VTKm_INSTALL_ONLY_LIBRARIES)
install(DIRECTORY vtkmtaotuple
DESTINATION ${VTKm_INSTALL_INCLUDE_DIR}/${kit_dir}/)
endif()