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.

Sign up for GitHub

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

Jump to bottom

CMake refactoring #4

Merged
merged 7 commits into from
Feb 3, 2016
Merged

CMake refactoring #4

merged 7 commits into from
Feb 3, 2016

Conversation

bilke
Copy link
Member

@bilke bilke commented Feb 2, 2016

  • Replaced ogs config options with one CMake variable OGS_CONFIG which defaults to FEM. Possible values can be switched through in ccmake and cmake-gui, for e.g. Gems-config with PETSc use -DOGS_CONFIG=PETSC_GEMS instead of -DOGS_FEM_PETSC_GEMS=ON
  • Benchmark defintions in CMake now use a new CONFIG-parameter, e.g. CONFIG MPI
  • Lots of cleanup and deletion of old (mainly CMake-) files

@bilke
Replaced ogs config options with one CMake variable OGS_CONFIG.
80b3c79 
Defaults to FEM. Possible values can be switched through in ccmake and cmake-gui.
@bilke
Benchmarks use the new CMake config.
655e52e 
Cleanup of old benchmark functionality.
@bilke
Cleanup of old scripts.
5b8990f
@bilke
Replaced Configure.h and BuildInfo.h with a better approach.
ce81911 
Changes in variable content only trigger a relink, not a rebuild.
@bilke
More CMake cleanup.
5a4be13
@bilke
Correct order of CMake commands.
c26c4fd
wenqing
wenqing reviewed Feb 3, 2016
View reviewed changes
Base/BuildInfo.h
@@ -0,0 +1,37 @@
/**
* \file BuildInfo.h.in
Copy link
Member

Choose a reason for hiding this comment

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

\file BuildInfo.h

@wenqing
Copy link
Member

wenqing commented Feb 3, 2016

👍

bilke added a commit that referenced this pull request Feb 3, 2016
@bilke
Merge pull request #4 from bilke/cmake-refactor
9337b91 
CMake refactoring
@bilke bilke merged commit 9337b91 into ufz:master Feb 3, 2016
@bilke bilke deleted the cmake-refactor branch February 3, 2016 12:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@wenqing wenqing

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@bilke @wenqing