OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #912 from atgeirr/bump-version

Browse Source 
Bump version and unify format of dune.module.
This commit is contained in:
dr-robertk 2015-10-23 15:08:32 +02:00
commit d43e447852
4 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists_files.cmake
View File

@ -143,7 +143,6 @@ list (APPEND MAIN_SOURCE_FILES
opm/core/utility/parameters/tinyxml/tinyxmlerror.cpp opm/core/utility/parameters/tinyxml/tinyxmlerror.cpp
opm/core/utility/parameters/tinyxml/tinyxmlparser.cpp opm/core/utility/parameters/tinyxml/tinyxmlparser.cpp
opm/core/utility/parameters/tinyxml/xmltest.cpp opm/core/utility/parameters/tinyxml/xmltest.cpp
opm/core/version.c
opm/core/wells/InjectionSpecification.cpp opm/core/wells/InjectionSpecification.cpp
opm/core/wells/ProductionSpecification.cpp opm/core/wells/ProductionSpecification.cpp
opm/core/wells/WellCollection.cpp opm/core/wells/WellCollection.cpp
@ -310,7 +309,6 @@ list (APPEND PUBLIC_HEADER_FILES
opm/core/linalg/blas_lapack.h opm/core/linalg/blas_lapack.h
opm/core/linalg/call_umfpack.h opm/core/linalg/call_umfpack.h
opm/core/linalg/sparse_sys.h opm/core/linalg/sparse_sys.h
opm/core/version.h
opm/core/wells.h opm/core/wells.h
opm/core/well_controls.h opm/core/well_controls.h
opm/core/pressure/CompressibleTpfa.hpp opm/core/pressure/CompressibleTpfa.hpp

12
dune.module
View File

@ -1,7 +1,13 @@
####################################################################
# Dune module information file: This file gets parsed by dunecontrol
# and by the CMake build scripts.
####################################################################
Module: opm-core Module: opm-core
Description: Open Porous Media Initiative Core Library Description: Open Porous Media Initiative Core Library
# if you change this, make sure to also change opm/core/version.h Version: 2016.04-pre
Version: 1.1 Label: 2016.04-pre
Label: 2013.10
Maintainer: atgeirr@sintef.no Maintainer: atgeirr@sintef.no
MaintainerName: Atgeirr F. Rasmussen
Url: http://opm-project.org
Depends: dune-common (>= 2.2) dune-istl (>= 2.2) opm-common opm-parser opm-material Depends: dune-common (>= 2.2) dune-istl (>= 2.2) opm-common opm-parser opm-material

8
opm/core/version.c
View File

@ -1,8 +0,0 @@
/* this file is written by the build system; don't include it anywhere else */
#include <project-version.h>
/* declaration of the externally visible symbol */
#include <opm/core/version.h>
/* initialization */
const char* const opm_core_version = PROJECT_VERSION;

11
opm/core/version.h
View File

@ -1,11 +0,0 @@
/**
* This symbol is initialized with the built version of the library.
*/
extern const char* const opm_core_version;
/**
* Current API level (for use with DUNE_VERSION_xxx):
*/
#define OPM_CORE_VERSION_MAJOR 1
#define OPM_CORE_VERSION_MINOR 1
#define OPM_CORE_VERSION_REVISION 0