[med-svn] [Git][med-team/libwfa2][master] 6 commits: routine-update: New upstream version

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / libwfa2


Commits:
cbc3bd6f by Andreas Tille at 2023-02-26T17:23:01+01:00
routine-update: New upstream version

- - - - -
31bdc938 by Andreas Tille at 2023-02-26T17:23:02+01:00
New upstream version 2.3.3
- - - - -
2526c1f7 by Andreas Tille at 2023-02-26T17:23:18+01:00
Update upstream source from tag 'upstream/2.3.3'

Update to upstream version '2.3.3'
with Debian dir d8f85202b7f3ecf7292006f33f2a4d4e315dd1a4
- - - - -
5c32a6c2 by Andreas Tille at 2023-02-26T17:23:37+01:00
Apply multi-arch hints.
+ libwfa2-0: Add Multi-Arch: same.

Changes-By: apply-multiarch-hints

- - - - -
bc700b66 by Andreas Tille at 2023-02-26T17:31:46+01:00
Add install scripts for libwfa2cpp

- - - - -
1f871d41 by Andreas Tille at 2023-02-26T17:32:26+01:00
Upload to unstable

- - - - -


5 changed files:

- CMakeLists.txt
- debian/changelog
- debian/control
- + debian/libwfa2-0.install
- + debian/libwfa2-dev.install


Changes:

=====================================
CMakeLists.txt
=====================================
@@ -84,10 +84,6 @@ endif(GPROF)
 
 # ---- Include files
 
-include_directories(wavefront)
-include_directories(utils)
-include_directories(.)
-
 file(GLOB INCLUDES
   wavefront/*.h*
   )
@@ -149,7 +145,27 @@ add_library(wfa2_static
 add_library(wfa2 SHARED ${wfa2lib_SOURCE})
 set_target_properties(wfa2_static PROPERTIES OUTPUT_NAME wfa2)
 set_target_properties(wfa2 PROPERTIES SOVERSION 0)
+target_include_directories(wfa2 PUBLIC . wavefront utils)
+target_include_directories(wfa2_static PUBLIC . wavefront utils)
+add_library(wfa2::wfa2 ALIAS wfa2)
+add_library(wfa2::wfa2_static ALIAS wfa2_static)
+
+# ---- C++ binding library
 
+set(wfa2cpp_SOURCE
+  bindings/cpp/WFAligner.cpp
+)
+file(GLOB CPP_INCLUDES
+  bindings/cpp/*.h*
+  )
+add_library(wfa2cpp_static STATIC ${wfa2cpp_SOURCE})
+add_library(wfa2cpp SHARED ${wfa2cpp_SOURCE})
+set_target_properties(wfa2cpp PROPERTIES SOVERSION 0)
+set_target_properties(wfa2cpp_static PROPERTIES OUTPUT_NAME wfa2cpp)
+target_link_libraries(wfa2cpp PUBLIC wfa2)
+target_link_libraries(wfa2cpp_static PUBLIC wfa2)
+add_library(wfa2::wfa2cpp ALIAS wfa2cpp)
+add_library(wfa2::wfa2cpp_static ALIAS wfa2cpp_static)
 
 # ---- Get version
 
@@ -181,10 +197,17 @@ add_wfa_test()
 
 # ---- Install
 
-install(TARGETS wfa2_static ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} )
-install(TARGETS wfa2 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} )
+# Do not install anything when used with FetchContent
+if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
+  install(TARGETS wfa2_static ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} )
+  install(TARGETS wfa2 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} )
+
+  install(FILES ${INCLUDES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/wfa2lib/wavefront)
+  install(FILES ${UTILS_INCLUDES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/wfa2lib/utils)
+  install(FILES ${ALIGNMENT_INCLUDES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/wfa2lib/alignment)
+  install(FILES ${SYSTEM_INCLUDES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/wfa2lib/system)
 
-install(FILES ${INCLUDES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/wfa2lib/wavefront)
-install(FILES ${UTILS_INCLUDES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/wfa2lib/utils)
-install(FILES ${ALIGNMENT_INCLUDES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/wfa2lib/alignment)
-install(FILES ${SYSTEM_INCLUDES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/wfa2lib/system)
+  install(TARGETS wfa2cpp ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+  install(TARGETS wfa2cpp_static ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+  install(FILES ${CPP_INCLUDES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/wfa2lib/bindings/cpp)
+endif()


=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+libwfa2 (2.3.3-1) unstable; urgency=medium
+
+  * New upstream version
+  * Add install scripts for libwfa2cpp
+
+ -- Andreas Tille <tille at debian.org>  Sun, 26 Feb 2023 17:31:54 +0100
+
 libwfa2 (2.3.2-1) unstable; urgency=medium
 
   * New upstream version


=====================================
debian/control
=====================================
@@ -18,6 +18,7 @@ Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends}
+Multi-Arch: same
 Description: exact gap-affine algorithm (shared library)
  The wavefront alignment (WFA) algorithm is an exact gap-affine algorithm
  that takes advantage of homologous regions between the sequences to


=====================================
debian/libwfa2-0.install
=====================================
@@ -0,0 +1 @@
+usr/lib/*/libwfa2cpp.so.0


=====================================
debian/libwfa2-dev.install
=====================================
@@ -0,0 +1,2 @@
+usr/lib/*/libwfa2cpp.a
+usr/lib/*/libwfa2cpp.so



View it on GitLab: https://salsa.debian.org/med-team/libwfa2/-/compare/436d506caf3b9532f0156825fe15167c2e42236c...1f871d416bf27ea373e985a2308f688d4f09d82e

-- 
View it on GitLab: https://salsa.debian.org/med-team/libwfa2/-/compare/436d506caf3b9532f0156825fe15167c2e42236c...1f871d416bf27ea373e985a2308f688d4f09d82e
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/20230226/b9a7adf5/attachment-0001.htm>