Skip to content

Commit

Permalink
Merge pull request #433 from ess-dmsc/issue_432
Browse files Browse the repository at this point in the history
Issue 432: fix for a missing link of the HL library
  • Loading branch information
jkotan authored Dec 13, 2019
2 parents e0dd0bf + 5c0e41d commit 283b0d2
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 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.3.2
VERSION 0.3.3
)

#=============================================================================
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.2 path/to/your/source
cmake -Dh5cpp_DIR=/home/user1/some/path/lib/cmake/h5cpp-0.3.3 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.2'
version = u'0.3.3'
# The full version, including alpha/beta/rc tags.
release = u'0.3.2'
release = u'0.3.3'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
4 changes: 2 additions & 2 deletions doc/source/users_guide/installing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ to update your package list and

.. code-block:: bash
$ apt-get install libh5cpp0.3.2 libh5cpp0.3.2-dbg libh5cpp0.3.2-doc libh5cpp0.3.2-dev
$ apt-get install libh5cpp0.3.3 libh5cpp0.3.3-dbg libh5cpp0.3.3-doc libh5cpp0.3.3-dev
to install the library of v0.3.2. Dependencies will be resolved automatically so you can
to install the library of v0.3.3. Dependencies will be resolved automatically so you can
start with working right after the installation has finished.
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.2`
The *CMake* package is installed below :file:`PREFIX/lib/cmake/h5cpp-0.3.3`
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.2)
VERSION 0.3.3)
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.2 ../
h5cpp_test:$ cmake -Dh5cpp_DIR=<INSTALLPREFIX>/lib/cmake/h5cpp-0.3.3 ../
h5cpp_test:$ make
The cmake variable :envvar:`h5cpp_DIR` tells :program:`cmake` where to look
Expand Down
2 changes: 1 addition & 1 deletion src/h5cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ foreach(HDF5_LIBRARY ${HDF5_LIBRARIES})
endforeach()

if(HDF5_VERSION VERSION_LESS 1.10.3)
set(H5CPP_PRIVATE_HL_LIBS ${HDF5_HL_LIBRARIES})
set(H5CPP_HL_PRIVATE_LIBS ${HDF5_HL_LIBRARIES})
foreach(HDF5_LIBRARY ${HDF5_HL_LIBRARIES})
get_filename_component(LIB_NAME ${HDF5_LIBRARY} NAME)
list(APPEND H5CPP_INTERFACE_LIBS ${LIB_NAME})
Expand Down

0 comments on commit 283b0d2

Please sign in to comment.