From 739986469a9b91d10275f3e0d920d7f5abcfa2d7 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Tue, 2 Jun 2020 10:08:46 -0700
Subject: [PATCH 1/2] add RMM_INCLUDE and RMM_LIBRARY options to allow linking
 to non-conda RMM

---
 cpp/CMakeLists.txt | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index 947d0318cb..5e7f263b2a 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -162,6 +162,23 @@ set(CMAKE_CUDA_FLAGS
 
 include(cmake/Dependencies.cmake)
 
+###################################################################################################
+# - RMM -------------------------------------------------------------------------------------------
+
+find_path(RMM_INCLUDE "rmm"
+          HINTS "$ENV{RMM_ROOT}/include")
+
+find_library(RMM_LIBRARY "rmm"
+             HINTS "$ENV{RMM_ROOT}/lib" "$ENV{RMM_ROOT}/build")
+
+message(STATUS "RMM: RMM_LIBRARY set to ${RMM_LIBRARY}")
+message(STATUS "RMM: RMM_INCLUDE set to ${RMM_INCLUDE}")
+
+add_library(rmm SHARED IMPORTED ${RMM_LIBRARY})
+if(RMM_INCLUDE AND RMM_LIBRARY)
+    set_target_properties(rmm PROPERTIES IMPORTED_LOCATION ${RMM_LIBRARY})
+endif(RMM_INCLUDE AND RMM_LIBRARY)
+
 ##############################################################################
 # - include paths ------------------------------------------------------------
 
@@ -170,10 +187,11 @@ set(RAFT_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include CACHE STRING
 
 set(RAFT_INCLUDE_DIRECTORIES
   ${RAFT_INCLUDE_DIR}
-  ${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES})
+  ${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES}
+  "${RMM_INCLUDE}")
 
 if(DEFINED ENV{CONDA_PREFIX})
-  message(STATUS "Using RMM installation froM $ENV{CONDA_PREFIX}")
+  message(STATUS "Using RMM installation from $ENV{CONDA_PREFIX}")
   list(APPEND RAFT_INCLUDE_DIRECTORIES $ENV{CONDA_PREFIX}/include)
 endif(DEFINED ENV{CONDA_PREFIX})
 
@@ -187,7 +205,7 @@ set(RAFT_LINK_LIBRARIES
   ${CUDA_cusparse_LIBRARY}
   rmm)
 
-set(RAFT_LINK_DIRECTORIES "")
+set(RAFT_LINK_DIRECTORIES "${RMM_LIBRARY}")
 
 if(DEFINED ENV{CONDA_PREFIX})
   list(APPEND RAFT_LINK_DIRECTORIES $ENV{CONDA_PREFIX}/lib)

From 7e99a33e1d5bc71f52c62ae52356c44e6b8b1ad6 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Tue, 2 Jun 2020 10:22:45 -0700
Subject: [PATCH 2/2] changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9490099450..cdd0bb7eca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## New Features
 
 ## Improvements
+- PR #13: Add RMM_INCLUDE and RMM_LIBRARY options to allow linking to non-conda RMM
 
 ## Bug Fixes