[med-svn] [Git][med-team/seqwish][master] Build-Depends: libatomicbitvector-dev, Do not check for bbhash and atomicbitvector in cmake

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / seqwish


Commits:
de806904 by Andreas Tille at 2020-06-05T11:13:27+02:00
Build-Depends: libatomicbitvector-dev, Do not check for bbhash and atomicbitvector in cmake

- - - - -


2 changed files:

- debian/control
- debian/patches/use_debian_packaged_libs.patch


Changes:

=====================================
debian/control
=====================================
@@ -7,6 +7,7 @@ Build-Depends: debhelper-compat (= 12),
                cmake,
                libsdsl-dev,
                libargs-dev,
+               libatomicbitvector-dev,
                libbbhash-dev,
                libgzstream-dev
 Standards-Version: 4.5.0


=====================================
debian/patches/use_debian_packaged_libs.patch
=====================================
@@ -31,3 +31,19 @@
  
  # mmmulti (memory mapped multimap, multiset, and interval tree)
  ExternalProject_Add(mmmulti
+@@ -90,6 +99,7 @@ ExternalProject_Add(ips4o
+ ExternalProject_Get_property(ips4o SOURCE_DIR)
+ set(ips4o_INCLUDE "${SOURCE_DIR}")
+ 
++if(!DEBIAN_BUILD)
+ # BBHash perfect hasher
+ ExternalProject_Add(bbhash
+   SOURCE_DIR "${CMAKE_SOURCE_DIR}/deps/BBHash"
+@@ -109,6 +119,7 @@ ExternalProject_Add(atomicbitvector
+   CONFIGURE_COMMAND "")
+ ExternalProject_Get_property(atomicbitvector SOURCE_DIR)
+ set(atomicbitvector_INCLUDE "${SOURCE_DIR}/include")
++endif
+ 
+ # atomic queue library
+ ExternalProject_Add(atomicqueue



View it on GitLab: https://salsa.debian.org/med-team/seqwish/-/commit/de806904593d44280b0749772150bb8c735ffa82

-- 
View it on GitLab: https://salsa.debian.org/med-team/seqwish/-/commit/de806904593d44280b0749772150bb8c735ffa82
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20200605/9804e086/attachment.html>