[med-svn] [Git][med-team/seqwish][master] Un-apply patch

[Nilesh Patra]

Nilesh Patra pushed to branch master at Debian Med / seqwish


Commits:
7a33232e by Nilesh Patra at 2020-10-29T19:01:15+05:30
Un-apply patch

- - - - -


1 changed file:

- CMakeLists.txt


Changes:

=====================================
CMakeLists.txt
=====================================
@@ -25,7 +25,6 @@ include_directories("${PROJECT_SOURCE_DIR}")
 # Add external projects
 include(${CMAKE_ROOT}/Modules/ExternalProject.cmake)
 
-if(!DEBIAN_BUILD)
 # sdsl-lite (full build using its cmake config)
 ExternalProject_Add(sdsl-lite
   SOURCE_DIR "${CMAKE_SOURCE_DIR}/deps/sdsl-lite"
@@ -37,11 +36,6 @@ set(sdsl-lite_INCLUDE "${INSTALL_DIR}/src/sdsl-lite-build/include")
 set(sdsl-lite-divsufsort_INCLUDE "${INSTALL_DIR}/src/sdsl-lite-build/external/libdivsufsort/include")
 set(sdsl-lite_LIB "${INSTALL_DIR}/src/sdsl-lite-build/lib")
 set(sdsl-lite-divsufsort_LIB "${INSTALL_DIR}/src/sdsl-lite-build/external/libdivsufsort/lib")
-else()
-message("Use Debian packaged sdsl-lite")
-message("=================================")
-# FIXME: Not yet tested
-# add_custom_target(libsdsl)
 
 # taywee's C++ args library, header only
 ExternalProject_Add(tayweeargs
@@ -58,7 +52,6 @@ ExternalProject_Add(gzipreader
   INSTALL_COMMAND "")
 ExternalProject_Get_property(gzipreader SOURCE_DIR)
 set(gzipreader_INCLUDE "${SOURCE_DIR}")
-endif()
 
 # mmmulti (memory mapped multimap, multiset, and interval tree)
 ExternalProject_Add(mmmulti
@@ -70,7 +63,6 @@ ExternalProject_Add(mmmulti
 ExternalProject_Get_property(mmmulti SOURCE_DIR)
 set(mmmulti_INCLUDE "${SOURCE_DIR}/src")
 
-if(!DEBIAN_BUILD)
 # iitii, like cgranges but with interpolation and memory mapping
 ExternalProject_Add(iitii
   SOURCE_DIR "${CMAKE_SOURCE_DIR}/deps/iitii"
@@ -80,7 +72,6 @@ ExternalProject_Add(iitii
   CONFIGURE_COMMAND "")
 ExternalProject_Get_property(iitii SOURCE_DIR)
 set(iitii_INCLUDE "${SOURCE_DIR}/src")
-endif()
 
 ExternalProject_Add(mmap_allocator
   SOURCE_DIR "${CMAKE_SOURCE_DIR}/deps/mmap_allocator"
@@ -90,7 +81,6 @@ ExternalProject_Get_property(mmap_allocator INSTALL_DIR)
 set(mmap_allocator_INCLUDE "${INSTALL_DIR}/include/mmap_allocator")
 set(mmap_allocator_LIB "${INSTALL_DIR}/lib")
 
-if(!DEBIAN_BUILD)
 # In-place Parallel Super Scalar Samplesort (IPS⁴o), header only
 ExternalProject_Add(ips4o
   SOURCE_DIR "${CMAKE_SOURCE_DIR}/deps/ips4o"
@@ -119,7 +109,6 @@ 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/7a33232eca59fb99370c4afafc17d72625932cd3

-- 
View it on GitLab: https://salsa.debian.org/med-team/seqwish/-/commit/7a33232eca59fb99370c4afafc17d72625932cd3
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/20201029/0a439689/attachment-0001.html>