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

[CMake] fix switching OGS_CONFIG #81

Merged
merged 2 commits into from May 30, 2017

Conversation

norihiro-w
Copy link
Contributor

This PR fixes a bug reported by Luca

If cmake is run for the first time, then it sets OGS_LSOLVER to the corresponding OGS_CONFIG: if no value is given it defaults to RF. Then if the same build folder is used afterwards, with different OGS_CONFIG, the OGS_LSOLVER needs to be set manually.
With cmake-gui, OGS_LSOLVER must be set manually, since it is set to RF with the first "configure".
However, if OGS_LSOLVER is set manually to DEFAULT, then it is updated automatically with the right value according to OGS_CONFIG, running "configure" for the second time.
Maybe there is an error and OGS_LSOLVER should be set to DEFAULT by the first "configure"? I am not very practical with cmake definitions and set-up.

In addition, another bug which might occur if one builds PETSc with external libraries is fixed.

@norihiro-w
Copy link
Contributor Author

@bilke I couldn't find out why Jenkins is failing. can you please have a look?

@wenqing
Copy link
Member

wenqing commented May 29, 2017

@norihiro-w test PETSc/THM out of the time limit.

@norihiro-w
Copy link
Contributor Author

@wenqing thanks. obviously the failure is not related to this change.

Copy link
Member

@wenqing wenqing left a comment

Choose a reason for hiding this comment

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

👍

@wenqing
Copy link
Member

wenqing commented May 30, 2017

@norihiro-w I have tested on envinf.

@norihiro-w norihiro-w merged commit 84d8fce into ufz:master May 30, 2017
@norihiro-w norihiro-w deleted the fix-cmake-switching-ogsconfig branch May 30, 2017 20:43
@norihiro-w
Copy link
Contributor Author

thanks. I merged this because it's a bugfix.

@bilke
Copy link
Member

bilke commented Jun 1, 2017

@norihiro-w Thanks for fixing this!

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.

None yet

3 participants