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

Jump to bottom

Attempt to Fix Broken C++ Build After cudftestutil is Made a Shared Lib #996

Merged
merged 7 commits into from
Mar 15, 2023
Merged

Attempt to Fix Broken C++ Build After cudftestutil is Made a Shared Lib #996

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
39b4a3d
CI fix attempt
isVoid Mar 15, 2023
9b4ed2a
find doxygen the new way
isVoid Mar 15, 2023
feb193d
add gtest fetch scripts
isVoid Mar 15, 2023
619a0f8
typo?
isVoid Mar 15, 2023
8b5ed46
update meta.yaml
isVoid Mar 15, 2023
eb42817
Merge branch 'branch-23.04' of github.com:rapidsai/cuspatial into fix…
isVoid Mar 15, 2023
82ed69b
fix cudf->cuspatial
isVoid Mar 15, 2023
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
7 changes: 5 additions & 2 deletions cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,10 @@ include(cmake/Modules/ConfigureCUDA.cmake)
rapids_cpm_init()
# find or add cuDF
include(cmake/thirdparty/CUSPATIAL_GetCUDF.cmake)

# find or install GoogleTest
if (CUSPATIAL_BUILD_TESTS)
include(cmake/thirdparty/get_gtests.cmake)
endif()

###################################################################################################
# - library targets -------------------------------------------------------------------------------
Expand Down Expand Up @@ -285,7 +288,7 @@ if(Doxygen_FOUND)
add_custom_command(
OUTPUT CUSPATIAL_DOXYGEN
WORKING_DIRECTORY ${CUSPATIAL_SOURCE_DIR}/doxygen
COMMAND ${DOXYGEN_EXECUTABLE} Doxyfile
COMMAND doxygen Doxyfile
isVoid marked this conversation as resolved.
Show resolved Hide resolved
VERBATIM
COMMENT "Custom command for building cuspatial doxygen docs."
)
Expand Down