From 24e71d251b77afe829907d74402a0fcc27786074 Mon Sep 17 00:00:00 2001
From: Robert Maynard <robert.maynard@kitware.com>
Date: Thu, 24 Jan 2019 14:26:40 -0500
Subject: [PATCH] VTK-m yet again has properly installed headers.

Fixes the install issues mentioned in #342
---
 CMake/VTKmWrappers.cmake                       | 15 +++------------
 vtkm/cont/cuda/CMakeLists.txt                  |  2 +-
 vtkm/cont/cuda/internal/CMakeLists.txt         |  2 +-
 vtkm/cont/cuda/internal/testing/CMakeLists.txt |  2 +-
 vtkm/exec/cuda/internal/CMakeLists.txt         |  2 +-
 vtkm/interop/cuda/CMakeLists.txt               |  2 +-
 vtkm/interop/cuda/internal/CMakeLists.txt      |  2 +-
 7 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/CMake/VTKmWrappers.cmake b/CMake/VTKmWrappers.cmake
index 7c661b54d..e7f9cf499 100644
--- a/CMake/VTKmWrappers.cmake
+++ b/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
diff --git a/vtkm/cont/cuda/CMakeLists.txt b/vtkm/cont/cuda/CMakeLists.txt
index 15db3585d..da9fb472b 100644
--- a/vtkm/cont/cuda/CMakeLists.txt
+++ b/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)
diff --git a/vtkm/cont/cuda/internal/CMakeLists.txt b/vtkm/cont/cuda/internal/CMakeLists.txt
index 44e2f4d90..2a3c77eaa 100644
--- a/vtkm/cont/cuda/internal/CMakeLists.txt
+++ b/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)
diff --git a/vtkm/cont/cuda/internal/testing/CMakeLists.txt b/vtkm/cont/cuda/internal/testing/CMakeLists.txt
index 8a446fa11..5db248f9e 100644
--- a/vtkm/cont/cuda/internal/testing/CMakeLists.txt
+++ b/vtkm/cont/cuda/internal/testing/CMakeLists.txt
@@ -23,4 +23,4 @@ set(headers
    Testing.h
    )
 
-vtkm_declare_headers(CUDA ${headers})
+vtkm_declare_headers(${headers})
diff --git a/vtkm/exec/cuda/internal/CMakeLists.txt b/vtkm/exec/cuda/internal/CMakeLists.txt
index 7eef53bec..0de9e42e6 100644
--- a/vtkm/exec/cuda/internal/CMakeLists.txt
+++ b/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)
diff --git a/vtkm/interop/cuda/CMakeLists.txt b/vtkm/interop/cuda/CMakeLists.txt
index 96bc84ca3..85860cff6 100644
--- a/vtkm/interop/cuda/CMakeLists.txt
+++ b/vtkm/interop/cuda/CMakeLists.txt
@@ -23,7 +23,7 @@ set(headers
   )
 
 #-----------------------------------------------------------------------------
-vtkm_declare_headers(CUDA ${headers})
+vtkm_declare_headers(${headers})
 
 add_subdirectory(internal)
 
diff --git a/vtkm/interop/cuda/internal/CMakeLists.txt b/vtkm/interop/cuda/internal/CMakeLists.txt
index 903619e42..94f633b81 100644
--- a/vtkm/interop/cuda/internal/CMakeLists.txt
+++ b/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})