From: Timur Safin via Tarantool-patches <tarantool-patches@dev.tarantool.org>
To: v.shpilevoy@tarantool.org
Cc: tarantool-patches@dev.tarantool.org
Subject: [Tarantool-patches] [PATCH resend v2 01/11] build: add Christian Hansen c-dt to the build
Date: Wed, 28 Jul 2021 13:34:03 +0300 [thread overview]
Message-ID: <f8f6ae8ff380ce9497b34e30152fb9b4d5a95eed.1627468002.git.tsafin@tarantool.org> (raw)
In-Reply-To: <cover.1627468002.git.tsafin@tarantool.org>
* 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
---
.gitmodules | 3 +++
CMakeLists.txt | 8 ++++++++
cmake/BuildCDT.cmake | 6 ++++++
src/CMakeLists.txt | 1 +
third_party/c-dt | 1 +
5 files changed, 19 insertions(+)
create mode 100644 cmake/BuildCDT.cmake
create mode 160000 third_party/c-dt
diff --git a/.gitmodules b/.gitmodules
index f2f91ee72..aa3fbae4e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -43,3 +43,6 @@
[submodule "third_party/xxHash"]
path = third_party/xxHash
url = https://github.com/tarantool/xxHash
+[submodule "third_party/c-dt"]
+ path = third_party/c-dt
+ url = https://github.com/tarantool/c-dt.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f9e1a7f79..81ee92933 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -571,6 +571,14 @@ endif()
# zstd
#
+#
+# Chritian Hanson c-dt
+#
+
+include(BuildCDT)
+libccdt_build()
+add_dependencies(build_bundled_libs cdt)
+
#
# Third-Party misc
#
diff --git a/cmake/BuildCDT.cmake b/cmake/BuildCDT.cmake
new file mode 100644
index 000000000..a19abb35c
--- /dev/null
+++ b/cmake/BuildCDT.cmake
@@ -0,0 +1,6 @@
+macro(libccdt_build)
+ set(LIBCDT_INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/third_party/c-dt/)
+ set(LIBCDT_LIBRARIES cdt)
+
+ add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/c-dt)
+endmacro()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c0e272bd9..ef6a295d5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -202,6 +202,7 @@ set (common_libraries
${ICONV_LIBRARIES}
${OPENSSL_LIBRARIES}
${XXHASH_LIBRARIES}
+ ${LIBCDT_LIBRARIES}
)
if (TARGET_OS_LINUX OR TARGET_OS_DEBIAN_FREEBSD)
diff --git a/third_party/c-dt b/third_party/c-dt
new file mode 160000
index 000000000..8b61c4ea0
--- /dev/null
+++ b/third_party/c-dt
@@ -0,0 +1 @@
+Subproject commit 8b61c4ea006efefc3a068f8df4a156bf5c725c89
--
2.29.2
next prev parent reply other threads:[~2021-07-28 10:34 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-28 10:34 [Tarantool-patches] [PATCH resend v2 00/11] Initial datetime support Timur Safin via Tarantool-patches
2021-07-28 10:34 ` Timur Safin via Tarantool-patches [this message]
2021-07-29 23:40 ` [Tarantool-patches] [PATCH resend v2 01/11] build: add Christian Hansen c-dt to the build Vladislav Shpilevoy via Tarantool-patches
2021-07-31 9:22 ` Timur Safin via Tarantool-patches
2021-07-28 10:34 ` [Tarantool-patches] [PATCH resend v2 02/11] lua: built-in module datetime Timur Safin via Tarantool-patches
2021-07-29 18:55 ` Oleg Babin via Tarantool-patches
2021-07-30 19:00 ` Timur Safin via Tarantool-patches
2021-07-31 6:29 ` Oleg Babin via Tarantool-patches
2021-07-31 16:51 ` Timur Safin via Tarantool-patches
2021-07-29 23:36 ` Vladislav Shpilevoy via Tarantool-patches
2021-07-30 15:39 ` Timur Safin via Tarantool-patches
2021-08-01 17:01 ` Vladislav Shpilevoy via Tarantool-patches
2021-08-01 20:23 ` Timur Safin via Tarantool-patches
2021-08-04 23:57 ` Vladislav Shpilevoy via Tarantool-patches
2021-07-28 10:34 ` [Tarantool-patches] [PATCH resend v2 03/11] lua, datetime: datetime tests Timur Safin via Tarantool-patches
2021-07-29 18:55 ` Oleg Babin via Tarantool-patches
2021-07-30 20:45 ` Timur Safin via Tarantool-patches
2021-07-28 10:34 ` [Tarantool-patches] [PATCH resend v2 04/11] lua, datetime: display datetime Timur Safin via Tarantool-patches
2021-07-29 18:55 ` Oleg Babin via Tarantool-patches
2021-07-30 21:48 ` Timur Safin via Tarantool-patches
2021-07-31 6:29 ` Oleg Babin via Tarantool-patches
2021-07-28 10:34 ` [Tarantool-patches] [PATCH resend v2 05/11] box, datetime: add messagepack support for datetime Timur Safin via Tarantool-patches
2021-07-28 10:34 ` [Tarantool-patches] [PATCH resend v2 06/11] box, datetime: datetime comparison for indices Timur Safin via Tarantool-patches
2021-07-29 18:56 ` Oleg Babin via Tarantool-patches
2021-07-30 22:18 ` Timur Safin via Tarantool-patches
2021-07-31 6:30 ` Oleg Babin via Tarantool-patches
2021-07-31 9:31 ` Timur Safin via Tarantool-patches
2021-07-28 10:34 ` [Tarantool-patches] [PATCH resend v2 07/11] lua, datetime: proper datetime encoding Timur Safin via Tarantool-patches
2021-07-29 18:57 ` Oleg Babin via Tarantool-patches
2021-07-30 22:20 ` Timur Safin via Tarantool-patches
2021-07-28 10:34 ` [Tarantool-patches] [PATCH resend v2 08/11] lua, datetime: calculated attributes for datetimes Timur Safin via Tarantool-patches
2021-07-29 18:57 ` Oleg Babin via Tarantool-patches
2021-07-30 22:30 ` Timur Safin via Tarantool-patches
2021-07-31 6:31 ` Oleg Babin via Tarantool-patches
2021-07-28 10:34 ` [Tarantool-patches] [PATCH resend v2 09/11] lua, datetime: time intervals support Timur Safin via Tarantool-patches
2021-07-29 18:58 ` Oleg Babin via Tarantool-patches
2021-07-30 22:58 ` Timur Safin via Tarantool-patches
2021-07-31 6:31 ` Oleg Babin via Tarantool-patches
2021-07-31 9:20 ` Timur Safin via Tarantool-patches
2021-07-28 10:34 ` [Tarantool-patches] [PATCH resend v2 10/11] lua, datetime: unixtime, timestamp setters in datetime.lua Timur Safin via Tarantool-patches
2021-07-29 18:58 ` Oleg Babin via Tarantool-patches
2021-07-30 23:11 ` Timur Safin via Tarantool-patches
2021-07-31 6:31 ` Oleg Babin via Tarantool-patches
2021-07-31 9:54 ` Timur Safin via Tarantool-patches
2021-07-28 10:34 ` [Tarantool-patches] [PATCH resend v2 11/11] datetime: changelog for datetime module Timur Safin via Tarantool-patches
2021-07-29 18:55 ` [Tarantool-patches] [PATCH resend v2 00/11] Initial datetime support Oleg Babin via Tarantool-patches
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f8f6ae8ff380ce9497b34e30152fb9b4d5a95eed.1627468002.git.tsafin@tarantool.org \
--to=tarantool-patches@dev.tarantool.org \
--cc=tsafin@tarantool.org \
--cc=v.shpilevoy@tarantool.org \
--subject='Re: [Tarantool-patches] [PATCH resend v2 01/11] build: add Christian Hansen c-dt to the build' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox