From 053065b3044fcb4d719dc31d6013d5ef766f7468 Mon Sep 17 00:00:00 2001 From: ptaylor Date: Thu, 7 Oct 2021 14:27:44 -0500 Subject: [PATCH 1/4] add spdlog to install export set --- cmake/thirdparty/get_spdlog.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmake/thirdparty/get_spdlog.cmake b/cmake/thirdparty/get_spdlog.cmake index b10763d5f..e3116a731 100644 --- a/cmake/thirdparty/get_spdlog.cmake +++ b/cmake/thirdparty/get_spdlog.cmake @@ -16,7 +16,8 @@ function(find_and_configure_spdlog) include(${rapids-cmake-dir}/cpm/spdlog.cmake) - rapids_cpm_spdlog() + rapids_cpm_spdlog(BUILD_EXPORT_SET rmm-exports + INSTALL_EXPORT_SET rmm-exports) if(spdlog_ADDED) install(TARGETS spdlog_header_only EXPORT rmm-exports) From a3784f18e5ac12530abdf2aca3ce0edf39c3a90f Mon Sep 17 00:00:00 2001 From: ptaylor Date: Thu, 7 Oct 2021 16:20:57 -0500 Subject: [PATCH 2/4] fix lint --- cmake/thirdparty/get_spdlog.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cmake/thirdparty/get_spdlog.cmake b/cmake/thirdparty/get_spdlog.cmake index e3116a731..08398234f 100644 --- a/cmake/thirdparty/get_spdlog.cmake +++ b/cmake/thirdparty/get_spdlog.cmake @@ -16,8 +16,7 @@ function(find_and_configure_spdlog) include(${rapids-cmake-dir}/cpm/spdlog.cmake) - rapids_cpm_spdlog(BUILD_EXPORT_SET rmm-exports - INSTALL_EXPORT_SET rmm-exports) + rapids_cpm_spdlog(BUILD_EXPORT_SET rmm-exports INSTALL_EXPORT_SET rmm-exports) if(spdlog_ADDED) install(TARGETS spdlog_header_only EXPORT rmm-exports) From 226d9c436a76370de2b8b00190ea0959add22c00 Mon Sep 17 00:00:00 2001 From: ptaylor Date: Thu, 7 Oct 2021 18:46:37 -0500 Subject: [PATCH 3/4] only install spdlog --- cmake/thirdparty/get_spdlog.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/thirdparty/get_spdlog.cmake b/cmake/thirdparty/get_spdlog.cmake index 08398234f..a7b41ab00 100644 --- a/cmake/thirdparty/get_spdlog.cmake +++ b/cmake/thirdparty/get_spdlog.cmake @@ -16,7 +16,7 @@ function(find_and_configure_spdlog) include(${rapids-cmake-dir}/cpm/spdlog.cmake) - rapids_cpm_spdlog(BUILD_EXPORT_SET rmm-exports INSTALL_EXPORT_SET rmm-exports) + rapids_cpm_spdlog(INSTALL_EXPORT_SET rmm-exports) if(spdlog_ADDED) install(TARGETS spdlog_header_only EXPORT rmm-exports) From 2623cf0dbddeaef9991eac0097d48c4d11a0c519 Mon Sep 17 00:00:00 2001 From: ptaylor Date: Fri, 8 Oct 2021 08:48:29 -0500 Subject: [PATCH 4/4] remove unnecessary call to rapids_export_package --- cmake/thirdparty/get_spdlog.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/cmake/thirdparty/get_spdlog.cmake b/cmake/thirdparty/get_spdlog.cmake index a7b41ab00..e816bff35 100644 --- a/cmake/thirdparty/get_spdlog.cmake +++ b/cmake/thirdparty/get_spdlog.cmake @@ -22,7 +22,6 @@ function(find_and_configure_spdlog) install(TARGETS spdlog_header_only EXPORT rmm-exports) else() rapids_export_package(BUILD spdlog rmm-exports) - rapids_export_package(INSTALL spdlog rmm-exports) endif() endfunction()