Mathieu Malaterre pushed to branch master at Debian Med / ncbi-vdb
Commits:
b1c9d499 by Mathieu Malaterre at 2022-02-21T09:28:30+01:00
d/patches: Further cmake fixes
- - - - -
1 changed file:
- debian/patches/fix_cmake.patch
Changes:
=====================================
debian/patches/fix_cmake.patch
=====================================
@@ -1,5 +1,7 @@
---- a/libs/CMakeLists.txt
-+++ b/libs/CMakeLists.txt
+Index: ncbi-vdb/libs/CMakeLists.txt
+===================================================================
+--- ncbi-vdb.orig/libs/CMakeLists.txt
++++ ncbi-vdb/libs/CMakeLists.txt
@@ -32,7 +32,6 @@ add_subdirectory(axf) # sra tools depend
add_subdirectory(blast)
add_subdirectory(cloud)
@@ -17,9 +19,19 @@
foreach( h IN ITEMS ${HEADERS} )
install( DIRECTORY ${CMAKE_SOURCE_DIR}/interfaces/${h} DESTINATION
${INST_INCDIR} )
endforeach()
---- a/test/CMakeLists.txt
-+++ b/test/CMakeLists.txt
-@@ -44,7 +44,6 @@ endif()
+Index: ncbi-vdb/test/CMakeLists.txt
+===================================================================
+--- ncbi-vdb.orig/test/CMakeLists.txt
++++ ncbi-vdb/test/CMakeLists.txt
+@@ -38,13 +38,12 @@ if( WIN32 )
+ set( COMMON_LIBS_WRITE ${COMMON_LINK_LIBRARIES} ncbi-wvdb Ws2_32 Crypt32 )
+ else()
+ link_libraries( ${COMMON_LINK_LIBRARIES} )
+- set( COMMON_LIBS_READ ncbi-vdb dl pthread )
+- set( COMMON_LIBS_WRITE ncbi-wvdb dl pthread )
++ set( COMMON_LIBS_READ ncbi-vdb dl pthread z bz2 zstd mbedx509 mbedtls
mbedcrypto)
++ set( COMMON_LIBS_WRITE ncbi-wvdb dl pthread z bz2 zstd mbedx509 mbedtls
mbedcrypto)
+ endif()
add_subdirectory(ktst)
add_subdirectory(cc)
@@ -27,8 +39,10 @@
add_subdirectory(judy_test)
add_subdirectory(klib)
add_subdirectory(kfs)
---- a/libs/ncbi-vdb/CMakeLists.txt
-+++ b/libs/ncbi-vdb/CMakeLists.txt
+Index: ncbi-vdb/libs/ncbi-vdb/CMakeLists.txt
+===================================================================
+--- ncbi-vdb.orig/libs/ncbi-vdb/CMakeLists.txt
++++ ncbi-vdb/libs/ncbi-vdb/CMakeLists.txt
@@ -30,9 +30,6 @@ set( VDB_LIB_CMN_TARGETS
ncbi-bam
vfs
View it on GitLab:
https://salsa.debian.org/med-team/ncbi-vdb/-/commit/b1c9d4997cced6975a87191c690212293b20f238
--
View it on GitLab:
https://salsa.debian.org/med-team/ncbi-vdb/-/commit/b1c9d4997cced6975a87191c690212293b20f238
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
