Skip to content

Commit a594be4

Browse files
committed
[INFRA] Put SDSL into contrib
1 parent ee18011 commit a594be4

26 files changed

+35149
-76
lines changed

.github/workflows/cron_latest_libraries.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
FILE="cmake/package-lock.cmake"
5252
sed -i -E 's@(set \(SEQAN3_\S+_VERSION )[^\)]+\)@\1main)@g' $FILE
5353
sed -i -E 's@VERSION( \$\{SEQAN3_\S+_VERSION\})@GIT_TAG\1@g' $FILE
54-
sed -i -E 's@SEQAN3_(SDSL|CEREAL)_VERSION main@SEQAN3_\1_VERSION master@g' $FILE
54+
sed -i -E 's@SEQAN3_CEREAL_VERSION main@SEQAN3_\1_VERSION master@g' $FILE
5555
cat $FILE
5656
5757
- name: Configure tests

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ Please see the [online documentation](https://docs.seqan.de/seqan3/main_user/) f
7676
| | [Clang](https://clang.llvm.org) | ≥ 17 | tested with `-stdlib=libc++` |
7777
| | [IntelOneAPI]() | ≥ 2024.0 | |
7878
|**build system** | [CMake](https://cmake.org) | ≥ 3.20 | optional, but recommended |
79-
|**required libs** | [SDSL](https://github.com/xxsds/sdsl-lite) | ≥ 3.0.3 | |
8079
|**optional libs** | [cereal](https://github.com/USCiLab/cereal) | ≥ 1.3.1 | required for serialisation and CTD support |
8180
| | [zlib](https://github.com/madler/zlib) | ≥ 1.2 | required for `*.gz` and `.bam` file support |
8281
| | [bzip2](https://www.sourceware.org/bzip2) | ≥ 1.0 | required for `*.bz2` file support |

cmake/cpack_install.cmake.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
# Only if creating the source package (`make package_source`):
66
# Copy dependency include directories into package's staging folder
77
if (CPACK_SOURCE_INSTALLED_DIRECTORIES)
8-
file (COPY "@SEQAN3_SDSL_INCLUDE_DIR@/" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/include/seqan3/vendor")
98
file (COPY "@SEQAN3_CEREAL_INCLUDE_DIR@/" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/include/seqan3/vendor")
109
configure_file ("@CPM_DOWNLOAD_LOCATION@" "${CMAKE_CURRENT_BINARY_DIR}/cmake/CPM.cmake" COPYONLY)
1110
if ("@use_ccache_ADDED@" STREQUAL "YES")

cmake/package-lock.cmake

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,6 @@ CPMDeclarePackage (cereal
2323
GITHUB_REPOSITORY USCiLab/cereal
2424
DOWNLOAD_ONLY TRUE
2525
QUIET YES)
26-
# sdsl-lite
27-
# Use URL download of the commit archive such that we do not clone submodules
28-
# Package name is still sdsl (name as v2 at xxsds/sdsl), but sdsl-lite is not currently being packaged
29-
# To avoid accidentally using the older sdsl, NAME is set to sdsl-lite
30-
set (SEQAN3_SDSL_VERSION 14cd017027ea742353fc5b500d1cb1d95896b77e CACHE STRING "" FORCE)
31-
CPMDeclarePackage (sdsl-lite
32-
NAME sdsl-lite
33-
URL https://github.com/xxsds/sdsl-lite/archive/${SEQAN3_SDSL_VERSION}.tar.gz # master
34-
DOWNLOAD_ONLY YES
35-
QUIET YES)
3626
# benchmark
3727
set (SEQAN3_BENCHMARK_VERSION 1.9.1 CACHE STRING "" FORCE)
3828
CPMDeclarePackage (benchmark

cmake/seqan3-config.cmake

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@
1515
# C++20
1616
# pthread
1717
#
18-
# SeqAn requires the following libraries:
19-
#
20-
# SDSL -- the succinct data structure library
21-
#
2218
# SeqAn has the following optional dependencies:
2319
#
2420
# ZLIB -- zlib compression library
@@ -137,36 +133,6 @@ else ()
137133
seqan3_config_error ("SeqAn3 include directory could not be found (SEQAN3_INCLUDE_DIR: '${SEQAN3_INCLUDE_DIR}')")
138134
endif ()
139135

140-
# ----------------------------------------------------------------------------
141-
# Require SDSL
142-
# ----------------------------------------------------------------------------
143-
144-
find_path (SEQAN3_SDSL_INCLUDE_DIR
145-
NAMES sdsl/version.hpp
146-
HINTS "${SEQAN3_INCLUDE_DIR}/seqan3/vendor")
147-
148-
# 1) Check the vendor directory of SeqAn3. This directory exists for source packages and installed packages.
149-
if (SEQAN3_SDSL_INCLUDE_DIR)
150-
seqan3_config_print ("Required dependency: SDSL found.")
151-
set (SEQAN3_DEPENDENCY_INCLUDE_DIRS ${SEQAN3_SDSL_INCLUDE_DIR} ${SEQAN3_DEPENDENCY_INCLUDE_DIRS})
152-
# 2) Get package via CPM.
153-
elseif (SEQAN3_HAS_CPM)
154-
CPMGetPackage (sdsl-lite)
155-
156-
find_path (SEQAN3_SDSL_INCLUDE_DIR
157-
NAMES sdsl/version.hpp
158-
HINTS "${sdsl-lite_SOURCE_DIR}/include")
159-
160-
if (SEQAN3_SDSL_INCLUDE_DIR)
161-
seqan3_config_print ("Required dependency: SDSL found.")
162-
set (SEQAN3_DEPENDENCY_INCLUDE_DIRS ${SEQAN3_SDSL_INCLUDE_DIR} ${SEQAN3_DEPENDENCY_INCLUDE_DIRS})
163-
else ()
164-
seqan3_config_error ("The SDSL library is required, but wasn't found.")
165-
endif ()
166-
else ()
167-
seqan3_config_error ("The SDSL library is required, but wasn't found.")
168-
endif ()
169-
170136
# ----------------------------------------------------------------------------
171137
# Force-deactivate optional dependencies
172138
# ----------------------------------------------------------------------------

cmake/seqan3-install.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,4 @@ install (FILES "${SEQAN3_CLONE_DIR}/cmake/seqan3-config.cmake" "${SEQAN3_CLONE_D
2121
# install seqan3 header files in /include/seqan3
2222
install (DIRECTORY "${SEQAN3_INCLUDE_DIR}/seqan3" TYPE INCLUDE)
2323

24-
install (DIRECTORY "${SEQAN3_SDSL_INCLUDE_DIR}/sdsl" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/seqan3/vendor")
2524
install (DIRECTORY "${SEQAN3_CEREAL_INCLUDE_DIR}/cereal" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/seqan3/vendor")

include/seqan3/alphabet/container/bitpacked_sequence.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,10 @@
1414
#include <ranges>
1515
#include <type_traits>
1616

17-
#include <sdsl/int_vector.hpp>
18-
1917
#include <seqan3/alphabet/detail/alphabet_proxy.hpp>
2018
#include <seqan3/alphabet/views/to_char.hpp>
2119
#include <seqan3/alphabet/views/to_rank.hpp>
20+
#include <seqan3/contrib/sdsl-lite.hpp>
2221
#include <seqan3/core/concept/cereal.hpp>
2322
#include <seqan3/core/range/detail/random_access_iterator.hpp>
2423
#include <seqan3/utility/math.hpp>

0 commit comments

Comments
 (0)