[med-svn] [Git][med-team/mmseqs2][master] Use libzstd-dev instead of that in /lib

[Shayan Doust]

Shayan Doust pushed to branch master at Debian Med / mmseqs2


Commits:
2c42d8d1 by Shayan Doust at 2019-07-15T23:04:31Z
Use libzstd-dev instead of that in /lib

- - - - -


2 changed files:

- debian/patches/series
- + debian/patches/use_system_zstd.patch


Changes:

=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
+use_system_zstd.patch
 use_system_gzstream.patch


=====================================
debian/patches/use_system_zstd.patch
=====================================
@@ -0,0 +1,46 @@
+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})



View it on GitLab: https://salsa.debian.org/med-team/mmseqs2/commit/2c42d8d131682ff609f3693103486550e08525c5

-- 
View it on GitLab: https://salsa.debian.org/med-team/mmseqs2/commit/2c42d8d131682ff609f3693103486550e08525c5
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/20190715/b9d88d84/attachment-0001.html>