put USE_HDF5 in the GNUMake build system #1047
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mic84
approved these changes
Jun 23, 2020
WeiqunZhang
reviewed
Jun 23, 2020
Tools/GNUMake/packages/Make.hdf5
Outdated
| HDF5_ABSPATH = $(abspath $(AMREX_HDF5_HOME)) | ||
| INCLUDE_LOCATIONS += $(HDF5_ABSPATH)/include | ||
| LIBRARY_LOCATIONS += $(HDF5_ABSPATH)/lib | ||
| LIBRARIES += -lhdf5 -lz -ldl -L$(HDF5_ABSPATH)/lib |
There was a problem hiding this comment.
Even when AMREX_HDF5_HOME is not defined, we should have those -ls.
There was a problem hiding this comment.
you mean these three: -lhdf5 -lz -ldl?
There was a problem hiding this comment.
yes, they might be found without -L.
There was a problem hiding this comment.
And we probably also want to pass -Xlinker=-rpath -Xlinker=$(HDF5_ABSPATH)/lib.
WeiqunZhang
reviewed
Jun 24, 2020
Tools/GNUMake/packages/Make.hdf5
Outdated
| HDF5_ABSPATH = $(abspath $(AMREX_HDF5_HOME)) | ||
| INCLUDE_LOCATIONS += $(HDF5_ABSPATH)/include | ||
| LIBRARY_LOCATIONS += $(HDF5_ABSPATH)/lib | ||
| LIBRARIES += -L$(HDF5_ABSPATH)/lib |
There was a problem hiding this comment.
This line is not needed because the path has already been added to LIBRARY_LOCATIONS. In Make.defs, we have
LDFLAGS += -L. $(addprefix -L, $(LIBRARY_LOCATIONS))
There was a problem hiding this comment.
We also have:
ifeq ($(USE_RPATH),TRUE)
LDFLAGS += -Xlinker -rpath -Xlinker '$(abspath .)' $(addprefix -Xlinker -rpath -Xlinker , $(abspath $(LIBRARY_LOCATIONS)))
endif
in Make.defs.
There was a problem hiding this comment.
Yes, but USE_RPATH is not defaulted to TRUE.
WeiqunZhang
approved these changes
Jun 24, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.