[med-svn] [Git][med-team/libmmmulti][master] Set atomicqueue_INCLUDE

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / libmmmulti


Commits:
4cef911c by Andreas Tille at 2020-10-26T08:59:11+01:00
Set atomicqueue_INCLUDE

- - - - -


2 changed files:

- debian/control
- debian/patches/NoExternalSourceTrees.patch


Changes:

=====================================
debian/control
=====================================
@@ -6,6 +6,7 @@ Uploaders: Steffen Moeller <moeller at debian.org>,
 Build-Depends: debhelper-compat (= 13),
                libargs-dev,
                libatomicbitvector-dev,
+               libatomic-queue-dev,
                libsdsl-dev,
                libips4o-dev,
                libparyfor-dev,


=====================================
debian/patches/NoExternalSourceTrees.patch
=====================================
@@ -1,8 +1,6 @@
-Index: multi/CMakeLists.txt
-===================================================================
---- multi.orig/CMakeLists.txt
-+++ multi/CMakeLists.txt
-@@ -22,110 +22,20 @@ set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_D
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -22,110 +22,22 @@ set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_D
  # The following folder will be included
  include_directories("${PROJECT_SOURCE_DIR}")
  
@@ -90,7 +88,8 @@ Index: multi/CMakeLists.txt
 -set(tayweeargs_INCLUDE "${SOURCE_DIR}")
 -
 -#set(CMAKE_BUILD_TYPE Release)
--
++set(atomicqueue_INCLUDE "/usr/include/atomic_queue")
+ 
  # set up our target executable and specify its dependencies and includes
  add_executable(mmmulti
    ${CMAKE_SOURCE_DIR}/src/main.cpp
@@ -107,14 +106,13 @@ Index: multi/CMakeLists.txt
 -  "${sdsl-lite-divsufsort_INCLUDE}"
 -  "${dynamic_INCLUDE}"
 -  "${ips4o_INCLUDE}"
--  "${atomicqueue_INCLUDE}"
--  "${paryfor_INCLUDE}"
--  "${tayweeargs_INCLUDE}")
 +#  "${sdsl-lite_INCLUDE}"
 +#  "${sdsl-lite-divsufsort_INCLUDE}"
 +#  "${dynamic_INCLUDE}"
 +#  "${ips4o_INCLUDE}"
-+#  "${atomicqueue_INCLUDE}"
+   "${atomicqueue_INCLUDE}"
+-  "${paryfor_INCLUDE}"
+-  "${tayweeargs_INCLUDE}")
 +#  "${paryfor_INCLUDE}"
 +#  "${tayweeargs_INCLUDE}"
 +  )



View it on GitLab: https://salsa.debian.org/med-team/libmmmulti/-/commit/4cef911c72712c953446ec1dd597c0ef0ddfb7ff

-- 
View it on GitLab: https://salsa.debian.org/med-team/libmmmulti/-/commit/4cef911c72712c953446ec1dd597c0ef0ddfb7ff
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/20201026/ed40c123/attachment-0001.html>