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

TPL build dependencies #26

Merged
merged 3 commits into from
Sep 3, 2020
Merged

TPL build dependencies #26

merged 3 commits into from
Sep 3, 2020

Conversation

mdavis36
Copy link
Collaborator

@mdavis36 mdavis36 commented Sep 2, 2020

Summary

This PR fixes the issue of building TPLs where one of the dependencies is provided by the user at a pre-installed location.

It works by checking if a target will be built or not, setting a variable <tpl_name>_build_dep to either empty or the <tpl_name>. The <tpl_name>_build_dep variable is then referenced in the DEPENDS list of the ExternalProject_Add of the dependent target.

Testing

I have built and tested this by providing my own pre-built and installed version of hdf5 and passing that to cmake. This built and passed all tests. However I was not able to build using the installed hdf5 in gapps/Spheral/tpl... .

@mdavis36 mdavis36 requested a review from jmikeowen September 2, 2020 19:40
@jmikeowen
Copy link
Collaborator

I think I just fixed the zlib dependency issue.

Copy link
Collaborator

@jmikeowen jmikeowen left a comment

Choose a reason for hiding this comment

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

Looking good I believe.

@mdavis36 mdavis36 merged commit 125966c into develop Sep 3, 2020
@mdavis36 mdavis36 deleted the bugfix/tpl-build-depends branch September 3, 2020 16:03
jmikeowen pushed a commit that referenced this pull request Dec 28, 2020
* commit '323593786093df94c2f549f1a117298a99b4bac8':
  Removed unneeded or incorrect checks in mash functions.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants