Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 21 additions & 13 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -133,15 +133,13 @@ target_include_directories(dbps_common_lib PUBLIC
)
target_link_libraries(dbps_common_lib PUBLIC tcb_span)

# Byte buffer processing library
add_library(dbps_byte_buffer_lib STATIC
src/processing/byte_buffer.cpp
)
target_include_directories(dbps_byte_buffer_lib PUBLIC
# Typed buffer processing library (header-only)
add_library(dbps_byte_buffer_lib INTERFACE)
target_include_directories(dbps_byte_buffer_lib INTERFACE
src/processing
src/common
)
target_link_libraries(dbps_byte_buffer_lib PUBLIC tcb_span)
target_link_libraries(dbps_byte_buffer_lib INTERFACE tcb_span)

# Server components library
add_library(dbps_server_lib STATIC
Expand Down Expand Up @@ -215,7 +213,7 @@ target_include_directories(dbps_local_lib PUBLIC
)

# Ensure PIC on static libs that are linked into shared libraries
set_target_properties(dbps_common_lib dbps_byte_buffer_lib dbps_server_lib dbps_local_lib
set_target_properties(dbps_common_lib dbps_server_lib dbps_local_lib
PROPERTIES POSITION_INDEPENDENT_CODE ON)

# =============================================================================
Expand Down Expand Up @@ -335,13 +333,21 @@ if(BUILD_TESTS)
)
target_include_directories(compression_utils_test PRIVATE src/processing)

# Byte buffer tests
add_executable(byte_buffer_test src/processing/byte_buffer_test.cpp)
target_link_libraries(byte_buffer_test
# Typed buffer tests
add_executable(typed_buffer_test src/processing/typed_buffer_test.cpp)
target_link_libraries(typed_buffer_test
dbps_byte_buffer_lib
gtest_main
)
target_include_directories(typed_buffer_test PRIVATE src/processing src/common)

# Typed buffer values tests
add_executable(typed_buffer_values_test src/processing/typed_buffer_values_test.cpp)
target_link_libraries(typed_buffer_values_test
dbps_byte_buffer_lib
gtest_main
)
target_include_directories(byte_buffer_test PRIVATE src/processing src/common)
target_include_directories(typed_buffer_values_test PRIVATE src/processing src/common)

# Basic encryptor tests
add_executable(basic_encryptor_test src/processing/encryptors/basic_encryptor_test.cpp)
Expand Down Expand Up @@ -536,7 +542,8 @@ if(BUILD_TESTS)
parquet_utils_test
bytes_utils_test
compression_utils_test
byte_buffer_test
typed_buffer_test
typed_buffer_values_test
basic_encryptor_test
auth_utils_test
dbpa_interface_test
Expand All @@ -559,7 +566,8 @@ if(BUILD_TESTS)
gtest_discover_tests(parquet_utils_test)
gtest_discover_tests(bytes_utils_test)
gtest_discover_tests(compression_utils_test)
gtest_discover_tests(byte_buffer_test)
gtest_discover_tests(typed_buffer_test)
gtest_discover_tests(typed_buffer_values_test)
gtest_discover_tests(basic_encryptor_test)
gtest_discover_tests(auth_utils_test)
gtest_discover_tests(dbpa_interface_test)
Expand Down
141 changes: 0 additions & 141 deletions src/processing/byte_buffer.h

This file was deleted.

Loading