Nilesh Patra pushed to branch master at Debian Med / spoa
Commits: af4560c0 by Nilesh Patra at 2022-11-29T19:46:20+00:00 [ci skip] Update packaged lib patch - - - - - 1 changed file: - debian/patches/use_debian_packaged_libs.patch Changes: ===================================== debian/patches/use_debian_packaged_libs.patch ===================================== @@ -4,20 +4,66 @@ Description: Use Debian packaged libraries Forwarded: not-needed --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -265,7 +265,8 @@ if (spoa_build_exe) +@@ -124,43 +124,6 @@ + endif () + endif () + +-if (spoa_build_exe OR spoa_build_tests) +- find_package(bioparser 3.0.13 QUIET) +- find_package(biosoup 0.10.0 QUIET) +- +- if (NOT bioparser_FOUND) +- FetchContent_Declare( +- bioparser +- GIT_REPOSITORY https://github.com/rvaser/bioparser +- GIT_TAG 3.0.13) +- +- FetchContent_GetProperties(bioparser) +- if (NOT bioparser_POPULATED) +- FetchContent_Populate(bioparser) +- add_subdirectory( +- ${bioparser_SOURCE_DIR} +- ${bioparser_BINARY_DIR} +- EXCLUDE_FROM_ALL) +- endif () +- endif () +- +- if (NOT biosoup_FOUND) +- FetchContent_Declare( +- biosoup +- GIT_REPOSITORY https://github.com/rvaser/biosoup +- GIT_TAG 0.10.0) +- +- FetchContent_GetProperties(biosoup) +- if (NOT biosoup_POPULATED) +- FetchContent_Populate(biosoup) +- add_subdirectory( +- ${biosoup_SOURCE_DIR} +- ${biosoup_BINARY_DIR} +- EXCLUDE_FROM_ALL) +- endif () +- endif () +-endif () +- + if (spoa_build_tests) + find_package(GTest 1.10.0 QUIET) + if (NOT GTest_FOUND) +@@ -264,8 +227,7 @@ + target_link_libraries(spoa_exe spoa - bioparser::bioparser +- bioparser::bioparser - biosoup::biosoup) -+ biosoup::biosoup + z) target_compile_definitions(spoa_exe PRIVATE VERSION="${PROJECT_VERSION}") set_property(TARGET spoa_exe PROPERTY OUTPUT_NAME spoa) -@@ -281,6 +282,7 @@ if (spoa_build_tests) +@@ -279,8 +241,7 @@ + + target_link_libraries(spoa_test spoa - bioparser::bioparser - biosoup::biosoup +- bioparser::bioparser +- biosoup::biosoup + z GTest::Main) View it on GitLab: https://salsa.debian.org/med-team/spoa/-/commit/af4560c0e447f541997a2ff37c7a4b83d0adffcc -- View it on GitLab: https://salsa.debian.org/med-team/spoa/-/commit/af4560c0e447f541997a2ff37c7a4b83d0adffcc You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
