From be858a7597d9c32822f2296b930be294db436e73 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Tue, 7 Sep 2021 18:32:15 -0400 Subject: [PATCH] rapids-export correctly reference build code block and doc strings (#9186) The update to rapids-cmake, introduced two regressions that this PR fixes. 1. re-include the a documentation header to the cudf-config.cmake files describing the project 2. The build directory cudf-config.cmake properly recreates testing dependencies and the `cudf::Thrust` target Authors: - Robert Maynard (https://github.com/robertmaynard) Approvers: - Paul Taylor (https://github.com/trxcllnt) - Mark Harris (https://github.com/harrism) URL: https://github.com/rapidsai/cudf/pull/9186 --- cpp/CMakeLists.txt | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 6e80d0b32fc..81377a7ebc2 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -662,8 +662,6 @@ rapids_export_write_dependencies(INSTALL cudf-testing-exports set(doc_string [=[ -#[=======================================================================[ - Provide targets for the cudf library. Built based on the Apache Arrow columnar memory format, cuDF is a GPU DataFrame @@ -687,19 +685,6 @@ This module offers an optional testing component which defines the following IMPORTED GLOBAL targets: cudf::cudftestutil - The main cudf testing library - -Result Variables -^^^^^^^^^^^^^^^^ - -This module will set the following variables in your project:: - - CUDF_FOUND - CUDF_VERSION - CUDF_VERSION_MAJOR - CUDF_VERSION_MINOR - CUDF_VERSION_PATCH - -#]=======================================================================] ]=]) @@ -726,6 +711,7 @@ rapids_export(INSTALL cudf EXPORT_SET cudf-exports GLOBAL_TARGETS cudf NAMESPACE cudf:: + DOCUMENTATION doc_string FINAL_CODE_BLOCK install_code_string) ################################################################################################ @@ -748,7 +734,8 @@ rapids_export(BUILD cudf EXPORT_SET cudf-exports GLOBAL_TARGETS cudf NAMESPACE cudf:: - FINAL_CODE_BLOCK code_string) + DOCUMENTATION doc_string + FINAL_CODE_BLOCK build_code_string) export(EXPORT cudf-testing-exports FILE ${CUDF_BINARY_DIR}/cudf-testing.cmake