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

[REVIEW] Fix library and include paths in CMakeLists.txt and setup.py #238

Merged
merged 6 commits into from
Jun 11, 2020
Merged

[REVIEW] Fix library and include paths in CMakeLists.txt and setup.py #238

merged 6 commits into from
Jun 11, 2020

Conversation

trxcllnt
Copy link
Contributor

@trxcllnt trxcllnt commented Jun 9, 2020 •
edited
Loading

Applies similar changes as rapidsai/cudf#5398,

  • Remove incorrect include path in setup.py
  • Use FetchContent to get cub, thrust, and libcudacxx
  • use GDAL::GDAL from CMake's find_package(GDAL)

The last two changes should make our CMakeLists.txt a bit more portable/compatible with CMake ExternalProject_Add().

@trxcllnt
Add GDAL_INCLUDE and GDAL_LIBRARY cmake paths. Use FetchContent to ge…
a596d3d 
…t cub, thrust, and libcudacxx. Remove incorrect include path in setup.py
@trxcllnt trxcllnt requested a review from harrism June 9, 2020 21:40
@trxcllnt trxcllnt requested review from a team as code owners June 9, 2020 21:40
rlratzel
rlratzel suggested changes Jun 9, 2020
View reviewed changes
Copy link
Contributor

@rlratzel rlratzel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a small request and a question.

cpp/CMakeLists.txt Show resolved Hide resolved
python/cuspatial/setup.py Show resolved Hide resolved
harrism
harrism requested changes Jun 10, 2020
View reviewed changes
Copy link
Member

@harrism harrism left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mostly include ordering concerns.

cpp/tests/CMakeLists.txt Outdated Show resolved Hide resolved
cpp/tests/CMakeLists.txt Outdated Show resolved Hide resolved
cpp/CMakeLists.txt Outdated Show resolved Hide resolved
cpp/benchmarks/CMakeLists.txt Outdated Show resolved Hide resolved
rlratzel
rlratzel approved these changes Jun 10, 2020
View reviewed changes
Copy link
Contributor

@rlratzel rlratzel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved assuming Mark's suggestions are in place and work.

@trxcllnt trxcllnt requested a review from harrism June 10, 2020 02:29
kkraus14
kkraus14 reviewed Jun 10, 2020
View reviewed changes
cpp/CMakeLists.txt Outdated Show resolved Hide resolved
cpp/CMakeLists.txt Outdated Show resolved Hide resolved
@kkraus14 kkraus14 added the 3 - Ready for Review Ready for review by team label Jun 10, 2020
@trxcllnt trxcllnt requested a review from a team as a code owner June 10, 2020 22:52
@trxcllnt trxcllnt requested a review from thomcom June 10, 2020 22:52
@harrism harrism merged commit 78a158e into rapidsai:branch-0.15 Jun 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kkraus14 kkraus14 kkraus14 approved these changes

@rlratzel rlratzel rlratzel approved these changes

@harrism harrism harrism approved these changes

@thomcom thomcom Awaiting requested review from thomcom

Assignees
No one assigned
Labels
3 - Ready for Review Ready for review by team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@trxcllnt @harrism @rlratzel @kkraus14