[med-svn] [hilive] 02/03: d/p/use.. Add patch for correct cmake module path

[Gert Wollny]

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

gert-guest pushed a commit to branch master
in repository hilive.

commit df4205df50140efa5b9979d23d24cf69d1361cef
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Tue Dec 6 07:29:46 2016 +0000

    d/p/use.. Add patch for correct cmake module path
---
 debian/changelog                   |  4 ++--
 debian/control                     |  1 +
 debian/patches/series              |  1 +
 debian/patches/use_FindSeQan.patch | 13 +++++++++++++
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 105dea0..76286aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
 hilive (0.3-1) UNRELEASED; urgency=medium
 
   * New upstream location with proper tagging
-  TODO: clarify what seqan version is needed (and how to integrate it
-        into the build.
+  * d/control: Add libseqan2-dev as build dependency 
+  * d/patches/use_...: correct path to cmake modules for FindSeQan
 
  -- Andreas Tille <tille at debian.org>  Thu, 04 Aug 2016 08:24:34 +0200
 
diff --git a/debian/control b/debian/control
index 27ee663..c005e8b 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,7 @@ Build-Depends: debhelper (>= 9),
                libboost-system-dev,
                libboost-filesystem-dev,
                libboost-program-options-dev,
+	       libseqan2-dev,
                zlib1g-dev,
                liblz4-dev,
                chrpath
diff --git a/debian/patches/series b/debian/patches/series
index d8e6b5d..688a7fa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 do_not_set_rpath.patch
+use_FindSeQan.patch
diff --git a/debian/patches/use_FindSeQan.patch b/debian/patches/use_FindSeQan.patch
new file mode 100644
index 0000000..595c84b
--- /dev/null
+++ b/debian/patches/use_FindSeQan.patch
@@ -0,0 +1,13 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -28,8 +28,8 @@
+ #############################
+ ### setup seqan libraries ###
+ 
+-set (CMAKE_MODULE_PATH "/home/schulzeja/masterthesis/tools/seqan-src/util/cmake") # adjust this to [pathToSeqanCode]/util/cmake
+-set (SEQAN_INCLUDE_PATH "/home/schulzeja/masterthesis/tools/seqan-src/include/") # adjust this to [pathToSeqanCode]/include
++set (CMAKE_MODULE_PATH "/usr/share/seqan/cmake") # adjust this to [pathToSeqanCode]/util/cmake
++#set (SEQAN_INCLUDE_PATH "/home/schulzeja/masterthesis/tools/seqan-src/include/") # adjust this to [pathToSeqanCode]/include
+ 
+ # Configure SeqAn, enabling features for libbz2 and zlib.
+ #set (SEQAN_FIND_DEPENDENCIES ZLIB BZip2) # original version from seqan tutorial

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/hilive.git