Skip to content

Commit

Permalink
Merge pull request #429 from ess-dmsc/issue_428
Browse files Browse the repository at this point in the history
Issue 428: Bump the version to 0.3.1
  • Loading branch information
jkotan authored Dec 10, 2019
2 parents 0740fb3 + f835465 commit 52965de
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 8 deletions.
3 changes: 2 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.0.0)
project(h5cpp
LANGUAGES CXX C
VERSION 0.1.3
VERSION 0.3.1
)

#=============================================================================
Expand All @@ -13,6 +13,7 @@ list(APPEND CMAKE_MODULE_PATH ${EXTRA_MODULES_DIR})
#=============================================================================
# Conan
#=============================================================================
# SET(CONAN_DISABLE_CHECK_COMPILER TRUE)
SET(CONAN_PROFILE "default" CACHE STRING "Name of conan profile to use, uses default by default")
SET(CONAN "AUTO" CACHE STRING "conan options AUTO (conan must be in path), MANUAL (expects conanbuildinfo.cmake in build directory) or DISABLE")
set(CONAN_FILE "conanfile_ess.txt" CACHE STRING "The conanfile to use for the build")
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ def get_win10_pipeline()

dir("_build") {
try {
bat 'cmake -DCMAKE_BUILD_TYPE=Release -G "Visual Studio 14 2015 Win64" ..'
bat 'cmake -DCMAKE_BUILD_TYPE=Release -G "Visual Studio 15 2017 Win64" ..'
} catch (e) {
failure_function(e, 'Windows10 / CMake failed')
}
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ cmake -DCMAKE_INSTALL_PREFIX=/home/user1/some/path ..
```
and accordingly, when building the client program:
```bash
cmake -Dh5cpp_DIR=/home/user1/some/path/lib/cmake/h5cpp-0.3.0 path/to/your/source
cmake -Dh5cpp_DIR=/home/user1/some/path/lib/cmake/h5cpp-0.3.1 path/to/your/source
```
where version number may vary.

Expand Down
4 changes: 2 additions & 2 deletions doc/design/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@
# built documents.
#
# The short X.Y version.
version = u'0.3.0'
version = u'0.3.1'
# The full version, including alpha/beta/rc tags.
release = u'0.3.0'
release = u'0.3.1'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
6 changes: 3 additions & 3 deletions doc/source/users_guide/using.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Using *h5cpp* with :program:`cmake`

*h5cpp* not only uses *CMake* as a build system but also provides
a *CMake* package which makes using the library with *CMake* quite simple.
The *CMake* package is installed below :file:`PREFIX/lib/cmake/h5cpp-0.3.0`
The *CMake* package is installed below :file:`PREFIX/lib/cmake/h5cpp-0.3.1`
where :envvar:`PREFIX` expands to the installation prefix used in the
inital cmake call of the installation procedure.

Expand Down Expand Up @@ -41,7 +41,7 @@ the following :file:`CMakeLists.txt` fiel is sufficient
cmake_minimum_required(VERSION 3.5.0)
project(h5cpp_test
LANGUAGES C CXX
VERSION 0.3.0)
VERSION 0.3.1)
set(CMAKE_CXX_STANDARD 11)
find_package(h5cpp REQUIRED)
Expand All @@ -56,7 +56,7 @@ You can build the code with
h5cpp_test:$ mkdir build
h5cpp_test:$ cd build
h5cpp_test:$ cmake -Dh5cpp_DIR=<INSTALLPREFIX>/lib/cmake/h5cpp-0.3.0 ../
h5cpp_test:$ cmake -Dh5cpp_DIR=<INSTALLPREFIX>/lib/cmake/h5cpp-0.3.1 ../
h5cpp_test:$ make
The cmake variable :envvar:`h5cpp_DIR` tells :program:`cmake` where to look
Expand Down

0 comments on commit 52965de

Please sign in to comment.