Commit 5508d17c authored by Robert Maynard's avatar Robert Maynard Committed by Kitware Robot

Merge topic 'correct_broken_install'

24e71d25 VTK-m yet again has properly installed headers.
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland's avatarKenneth Moreland <kmorel@sandia.gov>
Merge-request: !1525
parents 223a711f 24e71d25
......@@ -149,16 +149,8 @@ endfunction(vtkm_install_headers)
#-----------------------------------------------------------------------------
function(vtkm_declare_headers)
set(options CUDA)
set(oneValueArgs)
set(multiValueArgs)
cmake_parse_arguments(VTKm_DH "${options}"
"${oneValueArgs}" "${multiValueArgs}"
${ARGN}
)
vtkm_get_kit_name(name dir_prefix)
vtkm_install_headers("${dir_prefix}" ${hfiles})
vtkm_install_headers("${dir_prefix}" ${ARGN})
endfunction(vtkm_declare_headers)
#-----------------------------------------------------------------------------
......@@ -254,10 +246,9 @@ function(vtkm_library)
#generate the export header and install it
vtkm_generate_export_header(${lib_name})
#test and install the headers
#install the headers
vtkm_declare_headers(${VTKm_LIB_HEADERS}
EXCLUDE_FROM_TESTING ${VTKm_LIB_TEMPLATE_SOURCES}
)
${VTKm_LIB_TEMPLATE_SOURCES})
# When building libraries/tests that are part of the VTK-m repository inherit
# the properties from vtkm_developer_flags. The flags are intended only for
......
......@@ -26,7 +26,7 @@ set(headers
#-----------------------------------------------------------------------------
add_subdirectory(internal)
vtkm_declare_headers(CUDA ${headers})
vtkm_declare_headers(${headers})
#-----------------------------------------------------------------------------
if (TARGET vtkm::cuda)
......
......@@ -33,7 +33,7 @@ set(headers
VirtualObjectTransferCuda.h
)
vtkm_declare_headers(CUDA ${headers})
vtkm_declare_headers(${headers})
if (TARGET vtkm::cuda)
......
......@@ -23,4 +23,4 @@ set(headers
Testing.h
)
vtkm_declare_headers(CUDA ${headers})
vtkm_declare_headers(${headers})
......@@ -28,7 +28,7 @@ set(headers
)
#-----------------------------------------------------------------------------
vtkm_declare_headers(CUDA ${headers})
vtkm_declare_headers(${headers})
set_source_files_properties(ThrustPatches.h
PROPERTIES VTKm_CANT_BE_HEADER_TESTED TRUE)
......
......@@ -23,7 +23,7 @@ set(headers
)
#-----------------------------------------------------------------------------
vtkm_declare_headers(CUDA ${headers})
vtkm_declare_headers(${headers})
add_subdirectory(internal)
......
......@@ -24,4 +24,4 @@ set(headers
#-----------------------------------------------------------------------------
# Disable test builds because we'd need to link OpenGL libraries.
vtkm_declare_headers(CUDA ${headers})
vtkm_declare_headers(${headers})
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment