[med-svn] [Git][med-team/iitii][master] 2 commits: Include Debian packaged version of ctpl

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / iitii


Commits:
b2e100e0 by Andreas Tille at 2020-06-08T18:57:21+02:00
Include Debian packaged version of ctpl

- - - - -
77b8149a by Andreas Tille at 2020-06-08T19:47:04+02:00
Configuration of tests works now - but there are build problems

- - - - -


2 changed files:

- debian/control
- debian/patches/use_debian_packages_libs_in_test.patch


Changes:

=====================================
debian/control
=====================================
@@ -9,6 +9,8 @@ Build-Depends: debhelper-compat (= 13),
                libargs-dev,
                libmmap-allocator-dev (>= 0.4.0+git20200122.adbfbe1),
                libopenmpi-dev,
+               catch2 <!nocheck>,
+               pkg-config <!nocheck>,
                libhts-dev <!nocheck>,
                libctpl-dev <!nocheck>
 Standards-Version: 4.5.0


=====================================
debian/patches/use_debian_packages_libs_in_test.patch
=====================================
@@ -22,11 +22,16 @@ Description: Use Debian packaged libraries also in tests
  
  ExternalProject_Add(catch
    URL https://github.com/philsquared/Catch/archive/v2.9.1.zip
-@@ -59,15 +63,15 @@ include_directories(${source_dir}/single
+@@ -59,15 +63,20 @@ include_directories(${source_dir}/single
  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread -std=c++17 -Wall -Werror=return-type -Wno-reorder -fdiagnostics-color=auto")
  
  add_executable(test_iitii util.h test_iitii.cc)
 -add_dependencies(test_iitii catch libhts)
++find_package(PkgConfig REQUIRED)
++pkg_search_module(GLIB REQUIRED glib-2.0)
++include_directories(${GLIB_INCLUDE_DIRS})
++include_directories("../src") ## FIXME: for autopkgtest this line has to be removed
++## target_link_libraries(test_iitii ${GLIB_LDFLAGS})
 +#add_dependencies(test_iitii catch libhts)
  target_link_libraries(test_iitii libhts libz.a libbz2.a liblzma.a)
  
@@ -41,3 +46,14 @@ Description: Use Debian packaged libraries also in tests
  target_link_libraries(gnomad_benchmark libhts libz.a libbz2.a liblzma.a)
  
  include(CTest)
+--- a/test/util.h
++++ b/test/util.h
+@@ -8,7 +8,7 @@
+ #include <assert.h>
+ #include "kstring.h"
+ #include "tbx.h"
+-#include "ctpl_stl.h"
++#include "ctpl/ctpl.h"
+ #include "iitii.h"
+ 
+ using namespace std;



View it on GitLab: https://salsa.debian.org/med-team/iitii/-/compare/544fee73310d478b6b1226a0f8783f6fed3a3f37...77b8149aa51db32d8abff20497bc77a448c73219

-- 
View it on GitLab: https://salsa.debian.org/med-team/iitii/-/compare/544fee73310d478b6b1226a0f8783f6fed3a3f37...77b8149aa51db32d8abff20497bc77a448c73219
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/20200608/48afbacb/attachment-0001.html>