Changeset: 234ae7dc49df for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/234ae7dc49df
Modified Files:
sql/backends/monet5/vaults/sambam/CMakeLists.txt
sql/test/file_loader/sambam/Tests/SingleServer
Branch: samloader
Log Message:
Rename module to htslib, so in future we can add loaders for other file types
supported by htslib, such as cram, vcf, bcf.
diffs (65 lines):
diff --git a/sql/backends/monet5/vaults/sambam/CMakeLists.txt
b/sql/backends/monet5/vaults/sambam/CMakeLists.txt
--- a/sql/backends/monet5/vaults/sambam/CMakeLists.txt
+++ b/sql/backends/monet5/vaults/sambam/CMakeLists.txt
@@ -9,13 +9,13 @@
#]]
if(HAVE_HTSLIB)
- add_library(sambam MODULE)
+ add_library(htslib MODULE)
- target_sources(sambam
+ target_sources(htslib
PRIVATE
sambam.c)
- target_include_directories(sambam
+ target_include_directories(htslib
PRIVATE
$<$<BOOL:${HTSLIB_FOUND}>:${HTSLIB_INCLUDE_DIRS}>
$<TARGET_PROPERTY:mal,INTERFACE_INCLUDE_DIRECTORIES>
@@ -28,17 +28,17 @@ if(HAVE_HTSLIB)
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<INSTALL_INTERFACE:${INCLUDEDIR}/monetdb>)
- set_target_properties(sambam
+ set_target_properties(htslib
PROPERTIES
NO_SONAME ON
OUTPUT_NAME
- _sambam)
+ _htslib)
- target_compile_definitions(sambam
+ target_compile_definitions(htslib
PRIVATE
LIBHTSLIB)
- target_link_libraries(sambam
+ target_link_libraries(htslib
PRIVATE
monetdb_config_header
bat
@@ -46,13 +46,13 @@ if(HAVE_HTSLIB)
sqlinclude
HTSLIB::HTSLIB)
- install(TARGETS sambam
+ install(TARGETS htslib
DESTINATION ${CMAKE_INSTALL_LIBDIR}/monetdb5-${MONETDB_VERSION}
- COMPONENT sambam)
+ COMPONENT htslib)
if(WIN32)
install(FILES
- $<TARGET_PDB_FILE:sambam>
+ $<TARGET_PDB_FILE:htslib>
DESTINATION ${CMAKE_INSTALL_LIBDIR}/monetdb5-${MONETDB_VERSION}
OPTIONAL)
endif()
diff --git a/sql/test/file_loader/sambam/Tests/SingleServer
b/sql/test/file_loader/sambam/Tests/SingleServer
--- a/sql/test/file_loader/sambam/Tests/SingleServer
+++ b/sql/test/file_loader/sambam/Tests/SingleServer
@@ -1,1 +1,1 @@
---loadmodule sambam
+--loadmodule htslib
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
