From ee561936633f34dff14ae8e0388a9ba576b1edc2 Mon Sep 17 00:00:00 2001
From: Liam Wrubleski <Liam.Wrubleski@amd.com>
Date: Mon, 28 Mar 2022 15:52:13 -0600
Subject: [PATCH 1/2] Revert install location

---
 CMakeLists.txt        | 12 +++++-------
 thrust/CMakeLists.txt |  3 ++-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f6936e463..634586c99 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -174,15 +174,13 @@ endif()
 #Create header wrapper for backward compatibility
 if(BUILD_FILE_REORG_BACKWARD_COMPATIBILITY)
   rocm_wrap_header_dir(
-            ${CMAKE_SOURCE_DIR}/thrust
-	    PATTERNS "*.h"
-	    PATTERNS "*.inl"
-	    PATTERN "*.cuh"
-	    PATTERN "*.hpp"
+      ${CMAKE_SOURCE_DIR}/thrust
+	    PATTERNS "*.h" "*.inl" "*.cuh" "*.hpp"
+      HEADER_LOCATION include/thrust
 	    GUARDS SYMLINK WRAPPER
 	    WRAPPER_LOCATIONS rocthrust/include/thrust
-            OUTPUT_LOCATIONS rocthrust/wrapper/include/thrust
-	  )
+      OUTPUT_LOCATIONS rocthrust/wrapper/include/thrust
+  )
 endif( )
 
 set(THRUST_OPTIONS_DEBUG ${THRUST_OPTIONS_WARNINGS})
diff --git a/thrust/CMakeLists.txt b/thrust/CMakeLists.txt
index a41cb2ad5..8acd0f61a 100644
--- a/thrust/CMakeLists.txt
+++ b/thrust/CMakeLists.txt
@@ -15,6 +15,7 @@ configure_file(
 if(BUILD_FILE_REORG_BACKWARD_COMPATIBILITY)
   rocm_wrap_header_file(
       "rocthrust_version.hpp"
+      HEADER_LOCATION include/thrust
       WRAPPER_LOCATIONS rocthrust/include/thrust
       OUTPUT_LOCATIONS rocthrust/wrapper/include/thrust
   )
@@ -54,7 +55,7 @@ rocm_install(
   DIRECTORY
     "./"
     "${PROJECT_BINARY_DIR}/thrust/include/"
-  DESTINATION include/rocthrust
+  DESTINATION include/thrust
   FILES_MATCHING
   PATTERN "*.h"
   PATTERN "*.cuh"

From 3a4fb06f632455c328b161c20ab7c72b3b6f2e52 Mon Sep 17 00:00:00 2001
From: Liam Wrubleski <Liam.Wrubleski@amd.com>
Date: Mon, 28 Mar 2022 15:56:04 -0600
Subject: [PATCH 2/2] correct whitespace

---
 CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 634586c99..fabcbb71e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -175,10 +175,10 @@ endif()
 if(BUILD_FILE_REORG_BACKWARD_COMPATIBILITY)
   rocm_wrap_header_dir(
       ${CMAKE_SOURCE_DIR}/thrust
-	    PATTERNS "*.h" "*.inl" "*.cuh" "*.hpp"
+      PATTERNS "*.h" "*.inl" "*.cuh" "*.hpp"
       HEADER_LOCATION include/thrust
-	    GUARDS SYMLINK WRAPPER
-	    WRAPPER_LOCATIONS rocthrust/include/thrust
+      GUARDS SYMLINK WRAPPER
+      WRAPPER_LOCATIONS rocthrust/include/thrust
       OUTPUT_LOCATIONS rocthrust/wrapper/include/thrust
   )
 endif( )