[med-svn] [Git][med-team/metabat][master] Attemot to tweak cmake

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / metabat


Commits:
4fe5dad1 by Andreas Tille at 2020-05-28T20:28:04+02:00
Attemot to tweak cmake

- - - - -


4 changed files:

- CMakeLists.txt
- debian/control
- + debian/patches/series
- + debian/patches/use_debian_packaged_libs.patch


Changes:

=====================================
CMakeLists.txt
=====================================
@@ -8,10 +8,8 @@ endif()
 message("Installing ${CMAKE_BUILD_TYPE} MetaBAT into ${CMAKE_INSTALL_PREFIX}")
 
 include(${CMAKE_ROOT}/Modules/ExternalProject.cmake)
-find_package(ZLIB REQUIRED)
-# Find HTSlib. We find it with pkg-config, so it has static and dynamic libs by default.
-find_package(PkgConfig REQUIRED)
-pkg_check_modules(HTSlib REQUIRED htslib)
+include(cmake/zlib.cmake)
+include(cmake/htslib.cmake)
 
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)


=====================================
debian/control
=====================================
@@ -9,6 +9,8 @@ Build-Depends: debhelper-compat (= 13),
                libboost-system-dev,
                libboost-filesystem-dev,
                libboost-serialization-dev,
+               libboost-program-options-dev,
+               libboost-iostreams-dev,
                zlib1g-dev,
                libhts-dev,
                pkg-config,


=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+use_debian_packaged_libs.patch


=====================================
debian/patches/use_debian_packaged_libs.patch
=====================================
@@ -0,0 +1,48 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Thu, 28 May 2020 17:21:42 +0200
+Description: Use Debian packaged libraries
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -8,8 +8,10 @@ endif()
+ message("Installing ${CMAKE_BUILD_TYPE} MetaBAT into ${CMAKE_INSTALL_PREFIX}")
+ 
+ include(${CMAKE_ROOT}/Modules/ExternalProject.cmake)
+-include(cmake/zlib.cmake)
+-include(cmake/htslib.cmake)
++find_package(ZLIB REQUIRED)
++# Find HTSlib. We find it with pkg-config, so it has static and dynamic libs by default.
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(HTSlib REQUIRED htslib)
+ 
+ set(CMAKE_CXX_STANDARD 11)
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+@@ -23,7 +25,7 @@ add_definitions(-D_XOPEN_SOURCE=700)
+ 
+ set(PRE_CONFIGURE_FILE "metabat_version.h.in")
+ set(POST_CONFIGURE_FILE "metabat_version.h")
+-include(cmake/git-watcher.cmake)
++# include(cmake/git-watcher.cmake)
+ 
+ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+   # using Clang
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -36,7 +36,7 @@ set(targets metabat1 metabat2)
+ foreach(target ${targets})
+ 
+    add_executable(${target} ${target}.cpp)
+-   add_dependencies(${target} htslib zlib check_git_repository)
++   add_dependencies(${target} htslib zlib)
+    target_link_libraries(${target} ${zlib_LIB} ${Boost_LIBRARIES} ${EXTRALIBS} ) 
+ 
+ endforeach()
+@@ -48,7 +48,7 @@ install(TARGETS ${targets}
+ set(targets jgi_summarize_bam_contig_depths contigOverlaps)
+ foreach(target ${targets})
+    add_executable(${target} ${target}.cpp)
+-   add_dependencies(${target} htslib zlib check_git_repository)
++   add_dependencies(${target} htslib zlib)
+    target_link_libraries(${target} ${htslib_LIB} ${zlib_LIB} ${Boost_LIBRARIES} ) 
+ endforeach()
+ 



View it on GitLab: https://salsa.debian.org/med-team/metabat/-/commit/4fe5dad1d46f3180a851aee6768321c200c2a1f8

-- 
View it on GitLab: https://salsa.debian.org/med-team/metabat/-/commit/4fe5dad1d46f3180a851aee6768321c200c2a1f8
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/20200528/9047e7f6/attachment-0001.html>