mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-09-08 13:23:51 +00:00
Don't version include directory under build tree.
This is causing issues when building ParaView with VTK-m and VTK kits enabled.
This commit is contained in:
parent
ab10ff3bf2
commit
7fd7336a5d
@ -57,7 +57,7 @@ if (NOT DEFINED VTKm_INSTALL_CMAKE_MODULE_DIR)
|
|||||||
set(VTKm_INSTALL_CMAKE_MODULE_DIR "share/vtkm-${VTKm_VERSION_MAJOR}.${VTKm_VERSION_MINOR}/cmake")
|
set(VTKm_INSTALL_CMAKE_MODULE_DIR "share/vtkm-${VTKm_VERSION_MAJOR}.${VTKm_VERSION_MINOR}/cmake")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set(VTKm_BINARY_INCLUDE_DIR "${VTKm_BINARY_DIR}/include/vtkm-${VTKm_VERSION_MAJOR}.${VTKm_VERSION_MINOR}")
|
set(VTKm_BINARY_INCLUDE_DIR "${VTKm_BINARY_DIR}/include")
|
||||||
|
|
||||||
set(VTKm_EXPORT_NAME "VTKmTargets")
|
set(VTKm_EXPORT_NAME "VTKmTargets")
|
||||||
|
|
||||||
@ -78,8 +78,8 @@ add_library(vtkm INTERFACE)
|
|||||||
target_compile_features(vtkm INTERFACE cxx_auto_type)
|
target_compile_features(vtkm INTERFACE cxx_auto_type)
|
||||||
target_include_directories(vtkm INTERFACE
|
target_include_directories(vtkm INTERFACE
|
||||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
|
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
|
||||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include/vtkm-${VTKm_VERSION_MAJOR}.${VTKm_VERSION_MINOR}>
|
$<BUILD_INTERFACE:${VTKm_BINARY_INCLUDE_DIR}>
|
||||||
$<INSTALL_INTERFACE:include>
|
$<INSTALL_INTERFACE:${VTKm_INSTALL_INCLUDE_DIR}>
|
||||||
)
|
)
|
||||||
install(TARGETS vtkm EXPORT ${VTKm_EXPORT_NAME})
|
install(TARGETS vtkm EXPORT ${VTKm_EXPORT_NAME})
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user