[shark] 01/01: Add patch fixing HDF5 detection with CMake 3.6.

Ghislain Vaillant ghisvail-guest at moszumanska.debian.org
Wed Aug 24 16:05:01 UTC 2016


This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch debian/master
in repository shark.

commit a461b6b73c83f74ead77f01d72acb79d151e0f8f
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Wed Aug 24 14:54:54 2016 +0100

    Add patch fixing HDF5 detection with CMake 3.6.
---
 .../Fix-HDF5-detection-with-CMake-3.6.patch        | 24 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 25 insertions(+)

diff --git a/debian/patches/Fix-HDF5-detection-with-CMake-3.6.patch b/debian/patches/Fix-HDF5-detection-with-CMake-3.6.patch
new file mode 100644
index 0000000..eacd221
--- /dev/null
+++ b/debian/patches/Fix-HDF5-detection-with-CMake-3.6.patch
@@ -0,0 +1,24 @@
+From: Ghislain Antony Vaillant <ghisvail at gmail.com>
+Date: Wed, 24 Aug 2016 14:53:03 +0100
+Subject: Fix HDF5 detection with CMake 3.6.
+
+---
+ CMakeLists.txt | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bf453af..784abfe 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -202,9 +202,8 @@ mark_as_advanced(HDF5_DIR)
+ if(HDF5_FOUND)
+ 	if(HDF5_C_COMPILER_EXECUTABLE AND HDF5_CXX_COMPILER_EXECUTABLE)
+ 		message(STATUS "Checking HDF5 installation: HDF5 installation seems ok.")
+-		include_directories( ${HDF5_INCLUDE_DIR} )
+-		link_directories( ${HDF5_LIBRARY_DIR} )
+-		list(APPEND LINK_LIBRARIES ${HDF5_LIBRARIES})
++		include_directories( ${HDF5_INCLUDE_DIRS} )
++		list(APPEND LINK_LIBRARIES ${HDF5_LIBRARIES} ${HDF5_HL_LIBRARIES})
+ 	else()
+ 		message(STATUS "Checking HDF5 installation:HDF5 package might be broken.")
+ 		if(NOT( HDF5_C_COMPILER_EXECUTABLE))
diff --git a/debian/patches/series b/debian/patches/series
index f56dede..6a71228 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@ Fix-missing-boost-namespace-prefix.patch
 change-necessary-for-C-11-test-works-however-only-when-ev.patch
 fixed-HDF5-test.-fixes-64-and-43.patch
 Fix-code-and-setup-of-HDF5-testcase.patch
+Fix-HDF5-detection-with-CMake-3.6.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/shark.git



More information about the debian-science-commits mailing list