[openems] 01/02: More things to fix build
Ruben Undheim
rubund-guest at moszumanska.debian.org
Sun Nov 20 22:09:58 UTC 2016
This is an automated email from the git hooks/post-receive script.
rubund-guest pushed a commit to branch master
in repository openems.
commit 185137feeadd7f9285baf03c452c2c2c1796fbb8
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date: Sun Nov 20 22:01:52 2016 +0000
More things to fix build
---
debian/patches/0004-More-things-to-fix-build.patch | 43 ++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 44 insertions(+)
diff --git a/debian/patches/0004-More-things-to-fix-build.patch b/debian/patches/0004-More-things-to-fix-build.patch
new file mode 100644
index 0000000..df5ea66
--- /dev/null
+++ b/debian/patches/0004-More-things-to-fix-build.patch
@@ -0,0 +1,43 @@
+From: Ruben Undheim <ruben.undheim at gmail.com>
+Date: Sun, 20 Nov 2016 22:01:42 +0000
+Subject: More things to fix build
+
+---
+ CSXCAD/CMakeLists.txt | 6 +++---
+ openEMS/CMakeLists.txt | 6 +++---
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/CSXCAD/CMakeLists.txt b/CSXCAD/CMakeLists.txt
+index 5a90f62..bf2d7d6 100644
+--- a/CSXCAD/CMakeLists.txt
++++ b/CSXCAD/CMakeLists.txt
+@@ -90,9 +90,9 @@ INCLUDE_DIRECTORIES( ${fparser_INCLUDE_DIR} )
+ find_package(TinyXML REQUIRED)
+ ADD_DEFINITIONS( -DTIXML_USE_STL )
+
+-find_package(HDF5 1.8 COMPONENTS C HL REQUIRED)
+-INCLUDE_DIRECTORIES (${HDF5_INCLUDE_DIR})
+-link_directories(${HDF5_LIBRARY_DIRS})
++find_package(HDF5 1.8 COMPONENTS CXX HL REQUIRED)
++INCLUDE_DIRECTORIES (${HDF5_INCLUDE_DIRS})
++link_directories(${HDF5_LIBRARIES})
+ # hdf5 compat
+ ADD_DEFINITIONS( -DH5_USE_16_API )
+
+diff --git a/openEMS/CMakeLists.txt b/openEMS/CMakeLists.txt
+index 3ca2bb2..1f7d19e 100644
+--- a/openEMS/CMakeLists.txt
++++ b/openEMS/CMakeLists.txt
+@@ -108,9 +108,9 @@ find_package(TinyXML REQUIRED)
+ ADD_DEFINITIONS( -DTIXML_USE_STL )
+
+ # hdf5
+-find_package(HDF5 1.8 COMPONENTS C HL REQUIRED)
+-INCLUDE_DIRECTORIES (${HDF5_INCLUDE_DIR})
+-link_directories(${HDF5_LIBRARY_DIRS})
++find_package(HDF5 1.8 COMPONENTS CXX HL REQUIRED)
++INCLUDE_DIRECTORIES (${HDF5_INCLUDE_DIRS})
++link_directories(${HDF5_LIBRARIES})
+
+ # hdf5 compat
+ ADD_DEFINITIONS( -DH5_USE_16_API )
diff --git a/debian/patches/series b/debian/patches/series
index aaae0c4..21c7e70 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
0001-Fix-path-to-binaries-for-Debian.patch
0002-Spelling-fixes.patch
0003-Fix-build-issue-in-CSXCAD.patch
+0004-More-things-to-fix-build.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/openems.git
More information about the debian-science-commits
mailing list