From 76b621c05eadc10793b80de3e10ad0cdad1e8344 Mon Sep 17 00:00:00 2001
From: Dilawar Singh <dilawars@ncbs.res.in>
Date: Wed, 16 Nov 2016 12:10:28 +0530
Subject: [PATCH] New hdf5 version generates static library with different
name. Fix it.
---
moose-core/CMakeLists.txt | 4 ++--
moose-core/VERSION | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/moose-core/CMakeLists.txt b/moose-core/CMakeLists.txt
index 93810552..bb5930f1 100644
--- a/moose-core/CMakeLists.txt
+++ b/moose-core/CMakeLists.txt
@@ -236,12 +236,12 @@ endif()
if(HDF5_STATIC_HOME)
SET(HDF5_INCLUDE_DIRS "${HDF5_STATIC_HOME}/include")
find_library(HDF5_LIBRARY
- NAME libhdf5-static.a
+ NAMES libhdf5-static.a libhdf5.a
PATHS ${HDF5_STATIC_HOME}/lib ${HDF5_STATIC_HOME}/lib64
NO_DEFAULT_PATH
)
find_library(HDF5_HL_LIBRARY
- NAME libhdf5_hl-static.a
+ NAMES libhdf5_hl-static.a libhdf5_hl.a
PATHS ${HDF5_STATIC_HOME}/lib ${HDF5_STATIC_HOME}/lib64
NO_DEFAULT_PATH
)
diff --git a/moose-core/VERSION b/moose-core/VERSION
index e810ce78..50e47c89 100644
--- a/moose-core/VERSION
+++ b/moose-core/VERSION
@@ -1 +1 @@
-3.1.1-29-g7143a53
\ No newline at end of file
+3.1.1
\ No newline at end of file
--
GitLab