From 3b12cda38ee1f2ad56f6b6d7b717903be61f696a Mon Sep 17 00:00:00 2001
From: Dilawar Singh <dilawars@ncbs.res.in>
Date: Sat, 19 Nov 2016 11:58:49 +0530
Subject: [PATCH] A test commit to package hdf5-devel BhallaLab/moose#201.
---
moose-core/CMakeLists.txt | 9 ++++++++-
moose-core/VERSION | 2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/moose-core/CMakeLists.txt b/moose-core/CMakeLists.txt
index 1948958b..443c02aa 100644
--- a/moose-core/CMakeLists.txt
+++ b/moose-core/CMakeLists.txt
@@ -219,8 +219,15 @@ endif(NOT HDF5_FOUND)
if(HDF5_FOUND)
add_definitions( -DUSE_HDF5 )
+ # Latest cmake could not find libhdf5_hl.a libraries despite of setting
+ # USE_HDF5_STATIC_LIBRARIES.
+ if(USE_HDF5_STATIC_LIBRARIES AND $ENV{HDF5_ROOT})
+ find_library(HDF5_CXX_LIBRARIES libhdf5.a PATHS $ENV{HDF5_ROOT})
+ find_library(HDF5_HL_LIBRARIES libhdf5_hl.a PATHS $ENV{HDF5_ROOT})
+ endif(USE_HDF5_STATIC_LIBRARIES)
+
include_directories( ${HDF5_INCLUDE_DIRS} )
- foreach(HDF5_LIB ${HDF5_LIBRARIES} )
+ foreach(HDF5_LIB ${HDF5_CXX_LIBRARIES} ${HDF5_HL_LIBRARIES} )
if(HDF5_LIB)
get_filename_component( HDF5_LIB_EXT ${HDF5_LIB} EXT )
if(HDF5_LIB_EXT)
diff --git a/moose-core/VERSION b/moose-core/VERSION
index 50e47c89..753fb504 100644
--- a/moose-core/VERSION
+++ b/moose-core/VERSION
@@ -1 +1 @@
-3.1.1
\ No newline at end of file
+3.1.1-55-g1cd7d7e
\ No newline at end of file
--
GitLab