Merge topic 'correct_broken_install'

24e71d251 VTK-m yet again has properly installed headers.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1525

CMake/VTKmWrappers.cmake

@@ -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

vtkm/cont/cuda/CMakeLists.txt

@@ -26,7 +26,7 @@ set(headers
 
 #-----------------------------------------------------------------------------
 add_subdirectory(internal)
-vtkm_declare_headers(CUDA ${headers})
+vtkm_declare_headers(${headers})
 
 #-----------------------------------------------------------------------------
 if (TARGET vtkm::cuda)

vtkm/cont/cuda/internal/CMakeLists.txt

@@ -33,7 +33,7 @@ set(headers
   VirtualObjectTransferCuda.h
   )
 
-vtkm_declare_headers(CUDA ${headers})
+vtkm_declare_headers(${headers})
 
 
 if (TARGET vtkm::cuda)

vtkm/cont/cuda/internal/testing/CMakeLists.txt

@@ -23,4 +23,4 @@ set(headers
    Testing.h
    )
 
-vtkm_declare_headers(CUDA ${headers})
+vtkm_declare_headers(${headers})

vtkm/exec/cuda/internal/CMakeLists.txt

@@ -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)

vtkm/interop/cuda/CMakeLists.txt

@@ -23,7 +23,7 @@ set(headers
   )
 
 #-----------------------------------------------------------------------------
-vtkm_declare_headers(CUDA ${headers})
+vtkm_declare_headers(${headers})
 
 add_subdirectory(internal)
 

vtkm/interop/cuda/internal/CMakeLists.txt

@@ -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})