From 7fd7336a5db9ad20838fe31749741d47f1f993ad Mon Sep 17 00:00:00 2001
From: Allison Vacanti <allison.vacanti@kitware.com>
Date: Fri, 20 Oct 2017 14:40:41 -0400
Subject: [PATCH] Don't version include directory under build tree.

This is causing issues when building ParaView with VTK-m and VTK
kits enabled.
---
 CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1bd5bbf45..e71172917 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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")
 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")
 
@@ -78,8 +78,8 @@ add_library(vtkm INTERFACE)
 target_compile_features(vtkm INTERFACE cxx_auto_type)
 target_include_directories(vtkm INTERFACE
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include/vtkm-${VTKm_VERSION_MAJOR}.${VTKm_VERSION_MINOR}>
-  $<INSTALL_INTERFACE:include>
+  $<BUILD_INTERFACE:${VTKm_BINARY_INCLUDE_DIR}>
+  $<INSTALL_INTERFACE:${VTKm_INSTALL_INCLUDE_DIR}>
   )
 install(TARGETS vtkm EXPORT ${VTKm_EXPORT_NAME})