Fix INSTALL_CMAKE_DIR for GNU_DIRS and enable by default on Linux.#6410
Open
chuckatkins wants to merge 2 commits into
Open
Fix INSTALL_CMAKE_DIR for GNU_DIRS and enable by default on Linux.#6410chuckatkins wants to merge 2 commits into
chuckatkins wants to merge 2 commits into
Conversation
chuckatkins
requested review from
bmribler,
brtnfld,
derobins,
fortnern,
glennsong09,
jhendersonHDF,
lrknox,
mattjala,
qkoziol and
vchoi-hdfgroup
as code owners
Author
|
It seems the Windows / not windows default isn't working as expected. Debugging it now, will push a fix shortly |
The previous `lib/cmake/hdf5-config.cmake` isn't in CMake's find_package search path since CMake expects that to be a common path with each package having it's own subdirectory. This changes it to `lib/cmake/hdf5/hdf5-config.cmake` so the config is now found when the install prefix is in `CMAKE_PREFIX_PATH`. This also sets `HDF5_USE_GNU_DIRS=ON` by default for non-Windows builds. Fixes HDFGroup#6137
chuckatkins
force-pushed
the
fix-gnu-cmake-dir
branch
from
3b17982 to
1089ee1
Compare
Collaborator
|
Thanks for these changes @chuckatkins. We probably need to do some more testing but this generally looks fine; I think my only concern is enabling |
Contributor
|
This pull request has had no activity for 30 days and has been marked stale. Push a commit or comment to keep it open, or it will be flagged for maintainer review. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Describe your changes
The previous value of
HDF5_INSTALL_CMAKE_DIRoflib/cmakewhenHDF5_USE_GNU_DIRS=ONisn't in CMake'sfind_packagesearch path since CMake expects that to be a common path with each package having it's own subdirectory:<prefix>/<name>/cps/<prefix>/<name>/*/cps/<prefix>/cps/<name>/<prefix>/cps/<name>/*/<prefix>/cps/<prefix>/<prefix>/(cmake|CMake)/<prefix>/<name>*/<prefix>/<name>*/(cmake|CMake)/<prefix>/<name>*/(cmake|CMake)/<name>*/<prefix>/(lib/<arch>|lib*|share)/cps/<name>/<prefix>/(lib/<arch>|lib*|share)/cps/<name>/*/<prefix>/(lib/<arch>|lib*|share)/cps/<prefix>/(lib/<arch>|lib*|share)/cmake/<name>*/<prefix>/(lib/<arch>|lib*|share)/<name>*/<prefix>/(lib/<arch>|lib*|share)/<name>*/(cmake|CMake)/<prefix>/<name>*/(lib/<arch>|lib*|share)/cmake/<name>*/<prefix>/<name>*/(lib/<arch>|lib*|share)/<name>*/<prefix>/<name>*/(lib/<arch>|lib*|share)/<name>*/(cmake|CMake)/This changes
HDF5_INSTALL_CMAKE_DIRtolib/cmake/hdf5whenHDF5_USE_GNU_DIRS=ONso the CMake package config is now found when the install prefix is inCMAKE_PREFIX_PATH.This also sets
HDF5_USE_GNU_DIRS=ONby default for non-Windows builds.Issue ticket number (GitHub or JIRA)
Fixes #6137