Loading debian/patches/series +1 −0 Original line number Diff line number Diff line use_system_zstd.patch use_system_gzstream.patch debian/patches/use_system_zstd.patch 0 → 100644 +46 −0 Original line number Diff line number Diff line Index: mmseqs2/CMakeLists.txt =================================================================== --- mmseqs2.orig/CMakeLists.txt +++ mmseqs2/CMakeLists.txt @@ -59,17 +59,17 @@ if (APPLE) endif () # zstd -SET(ZSTD_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/lib/zstd") -SET(CMAKE_INSTALL_LIBDIR bin) -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/lib/zstd/build/cmake/CMakeModules") -OPTION(ZSTD_LEGACY_SUPPORT "LEGACY SUPPORT" OFF) -OPTION(ZSTD_BUILD_STATIC "BUILD STATIC LIBRARIES" ON) -OPTION(ZSTD_BUILD_SHARED "BUILD SHARED LIBRARIES" OFF) -OPTION(ZSTD_MULTITHREAD_SUPPORT "MULTITHREADING SUPPORT" OFF) -OPTION(ZSTD_BUILD_PROGRAMS "BUILD PROGRAMS" OFF) -OPTION(ZSTD_BUILD_CONTRIB "BUILD CONTRIB" OFF) -OPTION(ZSTD_BUILD_TESTS "BUILD TESTS" OFF) -add_subdirectory(lib/zstd/build/cmake/lib EXCLUDE_FROM_ALL) +#SET(ZSTD_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/lib/zstd") +#SET(CMAKE_INSTALL_LIBDIR bin) +#set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/lib/zstd/build/cmake/CMakeModules") +#OPTION(ZSTD_LEGACY_SUPPORT "LEGACY SUPPORT" OFF) +#OPTION(ZSTD_BUILD_STATIC "BUILD STATIC LIBRARIES" ON) +#OPTION(ZSTD_BUILD_SHARED "BUILD SHARED LIBRARIES" OFF) +#OPTION(ZSTD_MULTITHREAD_SUPPORT "MULTITHREADING SUPPORT" OFF) +#OPTION(ZSTD_BUILD_PROGRAMS "BUILD PROGRAMS" OFF) +#OPTION(ZSTD_BUILD_CONTRIB "BUILD CONTRIB" OFF) +#OPTION(ZSTD_BUILD_TESTS "BUILD TESTS" OFF) + # tinyexpr OPTION(TE_NAT_LOG "Define the log function as natural logarithm." ON) Index: mmseqs2/cmake/MMseqsSetupDerivedTarget.cmake =================================================================== --- mmseqs2.orig/cmake/MMseqsSetupDerivedTarget.cmake +++ mmseqs2/cmake/MMseqsSetupDerivedTarget.cmake @@ -6,7 +6,7 @@ function (mmseqs_setup_derived_target TA get_target_property(DEF_TMP mmseqs-framework COMPILE_DEFINITIONS) get_target_property(INCL_TMP mmseqs-framework INCLUDE_DIRECTORIES) - target_link_libraries(${TARGET} mmseqs-framework libzstd_static) + target_link_libraries(${TARGET} mmseqs-framework zstd) append_target_property(${TARGET} COMPILE_FLAGS ${COMPILE_TMP}) append_target_property(${TARGET} LINK_FLAGS ${LINK_TMP}) set_property(TARGET ${TARGET} APPEND PROPERTY COMPILE_DEFINITIONS ${DEF_TMP}) Loading
debian/patches/series +1 −0 Original line number Diff line number Diff line use_system_zstd.patch use_system_gzstream.patch
debian/patches/use_system_zstd.patch 0 → 100644 +46 −0 Original line number Diff line number Diff line Index: mmseqs2/CMakeLists.txt =================================================================== --- mmseqs2.orig/CMakeLists.txt +++ mmseqs2/CMakeLists.txt @@ -59,17 +59,17 @@ if (APPLE) endif () # zstd -SET(ZSTD_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/lib/zstd") -SET(CMAKE_INSTALL_LIBDIR bin) -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/lib/zstd/build/cmake/CMakeModules") -OPTION(ZSTD_LEGACY_SUPPORT "LEGACY SUPPORT" OFF) -OPTION(ZSTD_BUILD_STATIC "BUILD STATIC LIBRARIES" ON) -OPTION(ZSTD_BUILD_SHARED "BUILD SHARED LIBRARIES" OFF) -OPTION(ZSTD_MULTITHREAD_SUPPORT "MULTITHREADING SUPPORT" OFF) -OPTION(ZSTD_BUILD_PROGRAMS "BUILD PROGRAMS" OFF) -OPTION(ZSTD_BUILD_CONTRIB "BUILD CONTRIB" OFF) -OPTION(ZSTD_BUILD_TESTS "BUILD TESTS" OFF) -add_subdirectory(lib/zstd/build/cmake/lib EXCLUDE_FROM_ALL) +#SET(ZSTD_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/lib/zstd") +#SET(CMAKE_INSTALL_LIBDIR bin) +#set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/lib/zstd/build/cmake/CMakeModules") +#OPTION(ZSTD_LEGACY_SUPPORT "LEGACY SUPPORT" OFF) +#OPTION(ZSTD_BUILD_STATIC "BUILD STATIC LIBRARIES" ON) +#OPTION(ZSTD_BUILD_SHARED "BUILD SHARED LIBRARIES" OFF) +#OPTION(ZSTD_MULTITHREAD_SUPPORT "MULTITHREADING SUPPORT" OFF) +#OPTION(ZSTD_BUILD_PROGRAMS "BUILD PROGRAMS" OFF) +#OPTION(ZSTD_BUILD_CONTRIB "BUILD CONTRIB" OFF) +#OPTION(ZSTD_BUILD_TESTS "BUILD TESTS" OFF) + # tinyexpr OPTION(TE_NAT_LOG "Define the log function as natural logarithm." ON) Index: mmseqs2/cmake/MMseqsSetupDerivedTarget.cmake =================================================================== --- mmseqs2.orig/cmake/MMseqsSetupDerivedTarget.cmake +++ mmseqs2/cmake/MMseqsSetupDerivedTarget.cmake @@ -6,7 +6,7 @@ function (mmseqs_setup_derived_target TA get_target_property(DEF_TMP mmseqs-framework COMPILE_DEFINITIONS) get_target_property(INCL_TMP mmseqs-framework INCLUDE_DIRECTORIES) - target_link_libraries(${TARGET} mmseqs-framework libzstd_static) + target_link_libraries(${TARGET} mmseqs-framework zstd) append_target_property(${TARGET} COMPILE_FLAGS ${COMPILE_TMP}) append_target_property(${TARGET} LINK_FLAGS ${LINK_TMP}) set_property(TARGET ${TARGET} APPEND PROPERTY COMPILE_DEFINITIONS ${DEF_TMP})