Skip to content

Commit

Permalink
[infra] remove seqan3 dependency and submodule
Browse files Browse the repository at this point in the history
  • Loading branch information
h-2 committed Aug 29, 2022
1 parent 038fb81 commit 4bedfe0
Show file tree
Hide file tree
Showing 6 changed files with 3 additions and 31 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
[submodule "submodules/seqan3"]
path = submodules/seqan3
url = ../../seqan/seqan3.git
14 changes: 0 additions & 14 deletions build_system/biocpp_io-config.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -171,20 +171,6 @@ else ()
endif ()
endif ()

# ----------------------------------------------------------------------------
# Require SeqAn3
# ----------------------------------------------------------------------------

find_package (SeqAn3 REQUIRED QUIET
HINTS ${CMAKE_CURRENT_LIST_DIR}/../submodules/seqan3/build_system)

if (SEQAN3_FOUND)
bio_config_print ("Required dependency: SeqAn3 found (${SEQAN3_VERSION}).")
set (BIOCPP_IO_LIBRARIES ${BIOCPP_IO_LIBRARIES} seqan3_seqan3)
else ()
bio_config_print ("The SeqAn3 library is required, but wasn't found. Get it from https://github.com/seqan/seqan3")
endif ()

# ----------------------------------------------------------------------------
# ZLIB dependency
# ----------------------------------------------------------------------------
Expand Down
9 changes: 0 additions & 9 deletions include/bio/io/platform.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,6 @@ static_assert(__cplusplus >= 201709, "The BioC++ I/O library requires C++20, mak
# error The BioC++ I/O library include directory is not set correctly. Forgot to add -I ${INSTALLDIR}/include to your CXXFLAGS?
#endif

// SeqAn3 [required]
#if __has_include(<seqan3/version.hpp>)
# include <seqan3/version.hpp>
static_assert(seqan3::seqan3_version_major == 3, "SeqAn >= 3.1 is required by the BioC++ I/O library.");
static_assert(seqan3::seqan3_version_minor >= 1, "SeqAn >= 3.1 is required by the BioC++ I/O library.");
#else
# error The SeqAn3 library was not included.
#endif

// ============================================================================
// WORKAROUNDS
// ============================================================================
Expand Down
1 change: 0 additions & 1 deletion submodules/seqan3
Submodule seqan3 deleted from 9ec41b
4 changes: 2 additions & 2 deletions test/snippet/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ macro (biocpp_snippet test_name_prefix snippet snippet_base_path)
set (target "${snippet_target_name}_snippet")

add_executable (${target} "${snippet_base_path}/${snippet}")
target_link_libraries (${target} PUBLIC snippet_main biocpp::io fmt::fmt-header-only seqan3::seqan3)
target_compile_options (${target} PUBLIC -Wno-unused -Wno-interference-size) # TODO: remove the latter
target_link_libraries (${target} PUBLIC snippet_main biocpp::io fmt::fmt-header-only)
target_compile_options (${target} PUBLIC -Wno-unused)
set_target_properties(${target}
PROPERTIES
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${snippet_target_path}"
Expand Down
3 changes: 1 addition & 2 deletions test/unit/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ macro (bio_test unit_test_cpp)
biocpp_test_component (test_name "${unit_test}" TEST_NAME)

add_executable (${target} ${unit_test_cpp})
target_link_libraries (${target} biocpp::test::unit biocpp::io seqan3::seqan3)
target_compile_options (${target} PUBLIC -Wno-interference-size) # TODO(bio): remove the latter
target_link_libraries (${target} biocpp::test::unit biocpp::io)
if (BIOCPP_IO_VERBOSE_TESTS)
gtest_discover_tests(${target} TEST_PREFIX "${test_name}::" PROPERTIES TIMEOUT "30")
else ()
Expand Down

0 comments on commit 4bedfe0

Please sign in to comment.