Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] Fix typo in the name of cudf-testing-targets.cmake #9190

Merged
merged 2 commits into from
Sep 8, 2021
+29 −29
Merged

[FIX] Fix typo in the name of cudf-testing-targets.cmake #9190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34e62cf
fix typo in the name of cudf-testing-targets.cmake
trxcllnt Sep 7, 2021
e0ef1b1
add Arrow targets to build and install export sets after the ArrowCUD…
trxcllnt Sep 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -738,7 +738,7 @@ rapids_export(BUILD cudf
FINAL_CODE_BLOCK build_code_string)

export(EXPORT cudf-testing-exports
FILE ${CUDF_BINARY_DIR}/cudf-testing.cmake
FILE ${CUDF_BINARY_DIR}/cudf-testing-targets.cmake
NAMESPACE cudf::)
rapids_export_write_dependencies(BUILD cudf-testing-exports
"${CUDF_BINARY_DIR}/cudf-testing-dependencies.cmake")
Expand Down
56 changes: 28 additions & 28 deletions cpp/cmake/thirdparty/get_arrow.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,34 +101,6 @@ function(find_and_configure_arrow VERSION BUILD_STATIC ENABLE_S3 ENABLE_ORC ENAB
"ARROW_PROTOBUF_USE_SHARED ${ARROW_BUILD_SHARED}"
"ARROW_ZSTD_USE_SHARED ${ARROW_BUILD_SHARED}")

if(Arrow_ADDED)
rapids_export(BUILD Arrow
VERSION ${VERSION}
EXPORT_SET arrow_targets
GLOBAL_TARGETS arrow_shared arrow_static
NAMESPACE cudf::)

rapids_export(BUILD ArrowCUDA
VERSION ${VERSION}
EXPORT_SET arrow_cuda_targets
GLOBAL_TARGETS arrow_cuda_shared arrow_cuda_static
NAMESPACE cudf::)
endif()
# We generate the arrow-config and arrowcuda-config files
# when we built arrow locally, so always do `find_dependency`
rapids_export_package(BUILD Arrow cudf-exports)
rapids_export_package(INSTALL Arrow cudf-exports)

# We have to generate the find_dependency(ArrowCUDA) ourselves
# since we need to specify ArrowCUDA_DIR to be where Arrow
# was found, since Arrow packages ArrowCUDA.config in a non-standard
# location
rapids_export_package(BUILD ArrowCUDA cudf-exports)

include("${rapids-cmake-dir}/export/find_package_root.cmake")
rapids_export_find_package_root(BUILD Arrow [=[${CMAKE_CURRENT_LIST_DIR}]=] cudf-exports)
rapids_export_find_package_root(BUILD ArrowCUDA [=[${CMAKE_CURRENT_LIST_DIR}]=] cudf-exports)

set(ARROW_FOUND TRUE)
set(ARROW_LIBRARIES "")

Expand Down Expand Up @@ -184,6 +156,34 @@ function(find_and_configure_arrow VERSION BUILD_STATIC ENABLE_S3 ENABLE_ORC ENAB
message(FATAL_ERROR "CUDF: Arrow library not found or downloaded.")
endif()

if(Arrow_ADDED)
rapids_export(BUILD Arrow
VERSION ${VERSION}
EXPORT_SET arrow_targets
GLOBAL_TARGETS arrow_shared arrow_static
NAMESPACE cudf::)

rapids_export(BUILD ArrowCUDA
VERSION ${VERSION}
EXPORT_SET arrow_cuda_targets
GLOBAL_TARGETS arrow_cuda_shared arrow_cuda_static
NAMESPACE cudf::)
endif()
# We generate the arrow-config and arrowcuda-config files
# when we built arrow locally, so always do `find_dependency`
rapids_export_package(BUILD Arrow cudf-exports)
rapids_export_package(INSTALL Arrow cudf-exports)

# We have to generate the find_dependency(ArrowCUDA) ourselves
# since we need to specify ArrowCUDA_DIR to be where Arrow
# was found, since Arrow packages ArrowCUDA.config in a non-standard
# location
rapids_export_package(BUILD ArrowCUDA cudf-exports)

include("${rapids-cmake-dir}/export/find_package_root.cmake")
rapids_export_find_package_root(BUILD Arrow [=[${CMAKE_CURRENT_LIST_DIR}]=] cudf-exports)
rapids_export_find_package_root(BUILD ArrowCUDA [=[${CMAKE_CURRENT_LIST_DIR}]=] cudf-exports)

set(ARROW_FOUND "${ARROW_FOUND}" PARENT_SCOPE)
set(ARROW_LIBRARIES "${ARROW_LIBRARIES}" PARENT_SCOPE)

Expand Down