Skip to content

Commit f8f6ae8

Browse files
committed
build: add Christian Hansen c-dt to the build
* Integrated chansen/c-dt parser as 3rd party module to the Tarantool cmake build process. * Points to tsafin/c-dt instead iof original chansen/c-dt to have easier build integration, because there is additional commit which integrated cmake support
1 parent a02cfe6 commit f8f6ae8

File tree

5 files changed

+19
-0
lines changed

5 files changed

+19
-0
lines changed

.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,6 @@
4343
[submodule "third_party/xxHash"]
4444
path = third_party/xxHash
4545
url = https://github.com/tarantool/xxHash
46+
[submodule "third_party/c-dt"]
47+
path = third_party/c-dt
48+
url = https://github.com/tarantool/c-dt.git

CMakeLists.txt

+8
Original file line numberDiff line numberDiff line change
@@ -571,6 +571,14 @@ endif()
571571
# zstd
572572
#
573573

574+
#
575+
# Chritian Hanson c-dt
576+
#
577+
578+
include(BuildCDT)
579+
libccdt_build()
580+
add_dependencies(build_bundled_libs cdt)
581+
574582
#
575583
# Third-Party misc
576584
#

cmake/BuildCDT.cmake

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
macro(libccdt_build)
2+
set(LIBCDT_INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/third_party/c-dt/)
3+
set(LIBCDT_LIBRARIES cdt)
4+
5+
add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/c-dt)
6+
endmacro()

src/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ set (common_libraries
202202
${ICONV_LIBRARIES}
203203
${OPENSSL_LIBRARIES}
204204
${XXHASH_LIBRARIES}
205+
${LIBCDT_LIBRARIES}
205206
)
206207

207208
if (TARGET_OS_LINUX OR TARGET_OS_DEBIAN_FREEBSD)

third_party/c-dt

Submodule c-dt added at 8b61c4e

0 commit comments

Comments
 (0)