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
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,12 @@ Install required libraries and test dependencies:
sudo apt install pkg-config libssl-dev zlib1g-dev libgtest-dev libgmock-dev
```

Install [dconv](https://github.com/joinframework/dconv) from its release package:
```bash
wget https://github.com/joinframework/dconv/releases/download/v1.1.0/libdconv-dev_1.1.0_all.deb
sudo apt install ./libdconv-dev_1.1.0_all.deb
```

> **Compilers:** GCC 11+ or Clang 16+ (C++20). Clang requires `libclang-rt-dev` for coverage instrumentation (`--coverage`).
> **OpenSSL** provides the core TLS runtime.
> **Platform:** Linux 5.11+ and glibc 2.35+ (`epoll_pwait2`). The io_uring backend requires Linux 6.0+ (multishot `recv`).
Expand Down
1 change: 1 addition & 0 deletions cmake/joinConfig.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ foreach(comp ${join_FIND_COMPONENTS})
endforeach()

if(@JOIN_ENABLE_DATA@ OR @JOIN_ENABLE_SERVICES@)
find_dependency(dconv 1.1.0)
find_dependency(ZLIB)
endif()

Expand Down
2 changes: 1 addition & 1 deletion cmake/packaging.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ if(JOIN_ENABLE_CRYPTO)
string(APPEND JOIN_DEV_DEPENDS ", libssl-dev")
endif()
if(JOIN_ENABLE_DATA)
string(APPEND JOIN_DEV_DEPENDS ", zlib1g-dev")
string(APPEND JOIN_DEV_DEPENDS ", libdconv-dev (>= 1.1.0), zlib1g-dev")
endif()
if(JOIN_ENABLE_IO_URING)
string(APPEND JOIN_DEV_DEPENDS ", liburing-dev")
Expand Down
7 changes: 2 additions & 5 deletions data/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
cmake_minimum_required(VERSION 3.22.1)

find_package(dconv 1.1.0 REQUIRED)
find_package(ZLIB REQUIRED)

set(PUBLIC_HEADERS
include/join/diyfp.hpp
include/join/atodpow.hpp
include/join/dtoapow.hpp
include/join/dtoa.hpp
include/join/utf8.hpp
include/join/utf16.hpp
include/join/probe.hpp
include/join/value.hpp
include/join/value_builder.hpp
include/join/sax_error.hpp
Expand Down Expand Up @@ -47,6 +43,7 @@ target_include_directories(${JOIN_DATA}
target_link_libraries(${JOIN_DATA}
PUBLIC
${JOIN_CORE}
dconv::dconv
ZLIB::ZLIB
)

Expand Down
362 changes: 0 additions & 362 deletions data/include/join/atodpow.hpp

This file was deleted.

252 changes: 0 additions & 252 deletions data/include/join/diyfp.hpp

This file was deleted.

Loading
Loading