thebestvibedev/tromcho.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix test build with isa-l

Browse Source
This commit is contained in:
Vitaliy Filippov
2025-11-23 19:08:24 +03:00
parent d1678c67d9
commit 9b70bfc2e4
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/CMakeLists.txt
+1 -1
View File
@@ -115,7 +115,7 @@ install_symlink(vitastor-disk ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/vi
install_symlink(vitastor-cli ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/vitastor-rm) install_symlink(vitastor-cli ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/vitastor-rm)
install_symlink(vitastor-cli ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/vita) install_symlink(vitastor-cli ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/vita)
install( install(
TARGETS vitastor_blk vitastor_client vitastor_kv TARGETS vitastor_client vitastor_kv
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
) )
src/blockstore/CMakeLists.txt
+3 -2
View File
@@ -2,14 +2,15 @@ cmake_minimum_required(VERSION 2.8.12)
project(vitastor) project(vitastor)
# libvitastor_blk.so # libvitastor_blk.a
add_library(vitastor_blk SHARED add_library(vitastor_blk STATIC
../util/allocator.cpp ../util/crc32c.c ../util/ringloop.cpp ../util/allocator.cpp ../util/crc32c.c ../util/ringloop.cpp
multilist.cpp blockstore_heap.cpp blockstore_disk.cpp multilist.cpp blockstore_heap.cpp blockstore_disk.cpp
blockstore.cpp blockstore_impl.cpp blockstore_init.cpp blockstore_open.cpp blockstore.cpp blockstore_impl.cpp blockstore_init.cpp blockstore_open.cpp
blockstore_flush.cpp blockstore_read.cpp blockstore_stable.cpp blockstore_sync.cpp blockstore_write.cpp blockstore_flush.cpp blockstore_read.cpp blockstore_stable.cpp blockstore_sync.cpp blockstore_write.cpp
v1/flush.cpp v1/impl.cpp v1/init.cpp v1/journal.cpp v1/open.cpp v1/read.cpp v1/rollback.cpp v1/stable.cpp v1/sync.cpp v1/write.cpp v1/flush.cpp v1/impl.cpp v1/init.cpp v1/journal.cpp v1/open.cpp v1/read.cpp v1/rollback.cpp v1/stable.cpp v1/sync.cpp v1/write.cpp
) )
target_compile_options(vitastor_blk PUBLIC -fPIC)
target_link_libraries(vitastor_blk target_link_libraries(vitastor_blk
${LIBURING_LIBRARIES} ${LIBURING_LIBRARIES}
${ISAL_LIBRARIES} ${ISAL_LIBRARIES}
src/test/CMakeLists.txt
+5 -2
View File
@@ -45,6 +45,9 @@ add_executable(test_heap
../blockstore/blockstore_disk.cpp ../blockstore/blockstore_disk.cpp
../util/str_util.cpp ../util/str_util.cpp
) )
target_link_libraries(test_heap
${ISAL_LIBRARIES}
)
add_dependencies(build_tests test_heap) add_dependencies(build_tests test_heap)
add_test(NAME test_heap COMMAND test_heap) add_test(NAME test_heap COMMAND test_heap)
target_compile_options(test_heap PRIVATE -coverage) target_compile_options(test_heap PRIVATE -coverage)
@@ -63,13 +66,13 @@ add_executable(test_crc32
test_crc32.cpp test_crc32.cpp
) )
target_link_libraries(test_crc32 target_link_libraries(test_crc32
vitastor_blk vitastor_blk ${ISAL_LIBRARIES}
) )
# test_blockstore # test_blockstore
add_executable(test_blockstore EXCLUDE_FROM_ALL test_blockstore.cpp ringloop_mock.cpp) add_executable(test_blockstore EXCLUDE_FROM_ALL test_blockstore.cpp ringloop_mock.cpp)
add_dependencies(build_tests test_blockstore) add_dependencies(build_tests test_blockstore)
target_link_libraries(test_blockstore vitastor_blk) target_link_libraries(test_blockstore vitastor_blk vitastor_common ${ISAL_LIBRARIES})
add_test(NAME test_blockstore COMMAND test_blockstore) add_test(NAME test_blockstore COMMAND test_blockstore)
## test_shit ## test_shit