From 12e09c0f4223c977b6010ab53bcfe0b4e34e0cad Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Tue, 16 Mar 2021 16:21:24 -0500
Subject: [PATCH] add include/libcudf/libcudaxx to install_include_directories

---
 cpp/CMakeLists.txt                     | 3 ++-
 cpp/cmake/cudf-config.cmake.in         | 6 ------
 cpp/cmake/thirdparty/CUDF_GetCPM.cmake | 2 ++
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index 4bc11633347..103b163e260 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -421,7 +421,8 @@ target_include_directories(cudf
                        "$<BUILD_INTERFACE:${CUDF_SOURCE_DIR}/include>"
                        "$<BUILD_INTERFACE:${CUDF_GENERATED_INCLUDE_DIR}/include>"
            PRIVATE     "$<BUILD_INTERFACE:${CUDF_SOURCE_DIR}/src>"
-           INTERFACE   "$<INSTALL_INTERFACE:include>")
+           INTERFACE   "$<INSTALL_INTERFACE:include>"
+                       "$<INSTALL_INTERFACE:include/libcudf/libcudaxx>")
 
 # Add Conda library paths if specified
 if(CONDA_LINK_DIRS)
diff --git a/cpp/cmake/cudf-config.cmake.in b/cpp/cmake/cudf-config.cmake.in
index b3f29c4c055..1147e1160e7 100644
--- a/cpp/cmake/cudf-config.cmake.in
+++ b/cpp/cmake/cudf-config.cmake.in
@@ -19,15 +19,9 @@ find_dependency(Arrow @CUDF_VERSION_Arrow@)
 find_dependency(ArrowCUDA @CUDF_VERSION_Arrow@)
 find_dependency(Boost @CUDF_MIN_VERSION_Boost@)
 
-# find_dependency(jitify)
 find_dependency(rmm @CUDF_MIN_VERSION_rmm@)
-# find_dependency(Thrust @CUDF_MIN_VERSION_Thrust@)
-# find_dependency(dlpack @CUDF_MIN_VERSION_dlpack@)
-# find_dependency(libcudacxx @CUDF_MIN_VERSION_libcudacxx@)
 find_dependency(gtest @CUDF_MIN_VERSION_gtest@)
 
-# thrust_create_target(cudf::Thrust FROM_OPTIONS)
-
 list(POP_FRONT CMAKE_MODULE_PATH)
 
 include("${CMAKE_CURRENT_LIST_DIR}/cudf-targets.cmake")
diff --git a/cpp/cmake/thirdparty/CUDF_GetCPM.cmake b/cpp/cmake/thirdparty/CUDF_GetCPM.cmake
index 791b4f8594f..5162aaf6ce7 100644
--- a/cpp/cmake/thirdparty/CUDF_GetCPM.cmake
+++ b/cpp/cmake/thirdparty/CUDF_GetCPM.cmake
@@ -18,6 +18,8 @@ endif()
 
 include(${CPM_DOWNLOAD_LOCATION})
 
+# If a target is installed, found by the `find_package` step of CPMFindPackage,
+# and marked as IMPORTED, make it globally accessible to consumers of our libs.
 function(fix_cmake_global_defaults target)
     if(TARGET ${target})
         get_target_property(_is_imported ${target} IMPORTED)