Skip to content

Commit

Permalink
rapids-export correctly reference build code block and doc strings (#…
Browse files Browse the repository at this point in the history
…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: #9186
  • Loading branch information
robertmaynard authored Sep 7, 2021
1 parent a02f888 commit be858a7
Showing 1 changed file with 3 additions and 16 deletions.
19 changes: 3 additions & 16 deletions cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

#]=======================================================================]
]=])


Expand All @@ -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)

################################################################################################
Expand All @@ -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
Expand Down

0 comments on commit be858a7

Please sign in to comment.