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.

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

custom FETCHCONTENT_BASE_DIR bug fix #6513

Merged
merged 9 commits into from
Jun 24, 2024
Merged

Conversation

pefedotov
Copy link
Contributor

Fixes a bug related to incorrect paths when automatically loading hwloc.

If the path for downloaded projects is FETCHCONTENT_BASE_DIR
has been changed, then the existing cmake script points to a non-existent folder, since hwloc will be loaded to another location.

@pefedotov pefedotov requested a review from hkaiser as a code owner June 18, 2024 10:00
@jenkins-cscs
Copy link
Collaborator

Can one of the admins verify this patch?

Copy link

codacy-production bot commented Jun 18, 2024

Coverage summary from Codacy

See diff coverage on Codacy

Coverage variation Diff coverage
+0.12%
Coverage variation details
Coverable lines Covered lines Coverage
Common ancestor commit (049b935) 222123 188895 85.04%
Head commit (0887421) 191107 (-31016) 162749 (-26146) 85.16% (+0.12%)

Coverage variation is the difference between the coverage for the head and common ancestor commits of the pull request branch: <coverage of head commit> - <coverage of common ancestor commit>

Diff coverage details
Coverable lines Covered lines Diff coverage
Pull request (#6513) 0 0 ∅ (not applicable)

Diff coverage is the percentage of lines that are covered by tests out of the coverable lines that the pull request added or modified: <covered lines added or modified>/<coverable lines added or modified> * 100%

See your quality gate settings    Change summary preferences


🚀 Don’t miss a bit, follow what’s new on Codacy.

Codacy stopped sending the deprecated coverage status on June 5th, 2024. Learn more

cmake/HPX_SetupHwloc.cmake Outdated Show resolved Hide resolved
@hkaiser
Copy link
Member

hkaiser commented Jun 18, 2024

Also, please address the cmake-format issue reported (see https://gist.github.com/hkaiser/debb4ce2e5cf64722db0f49c90cee01a)

@pefedotov
Copy link
Contributor Author

Since cmake does not provide a single variable for all occasions, I decided to create a condition. If a special path was specified, then use it, otherwise, what was initially specified in the code (default path).

Copy link
Member

@hkaiser hkaiser left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@hkaiser hkaiser merged commit daa1fd5 into STEllAR-GROUP:master Jun 24, 2024
57 checks passed
@hkaiser
Copy link
Member

hkaiser commented Jun 24, 2024

Congratulations, your first PR to the HPX repository has just been merged! As a 'thank you' we offer a free STE||AR-Group t-shirt to all of our first-time contributors. If you are interested in receiving one, please get back to me directly so we can set up the delivery.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants