pkg-config petsc (next) #1914
Merged
pkg-config petsc (next) #1914
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
…-next Conflicts: src/fileio/datafile.cxx Use master version, where we do not add the same variable twice.
|
Looks like this has pulled in a bunch of commits from elsewhere. |
|
I merged master into next, as master contains e.g. a bug fix, that is not fixed in next: |
…-next Conflicts: src/bout++.cxx
|
Replaced by #1999 |
|
Something went wrong with #1999 The configure.ac master history list the pkg-config change: However, the next one doesn't: |
If we cannot find PETSc with PETSC_DIR/PETSC_ARCH, we ask pkg-conf to determine PETSc version and required flags.
|
I had to cherry-pick the old commits. The CMake changes where still there, but the configure.ac changes where gone ... |
|
@ZedThree Can you please merge this? If you would like me to clean the history, let me know. |
ZedThree
approved these changes
Apr 7, 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.
Allow to use pkg-config to detect petsc.
PETSc provides pkg-config files. Unlike the normal method, this is less dependent on finding the magic files of petsc in various locations, and can be compatible with the FHS
#1913 for next