From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id 59A586EC56; Wed, 28 Jul 2021 13:34:58 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 59A586EC56 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1627468498; bh=rH3UYBAhxwQtS5wqGw7rCOQRs2deagmlZr7T2CUONG4=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=LOgR4mBDXTxs/fJw5BFfKHdtvcaKav8c6uHdk74NTjhMZ9VpbYsgJHyHYUK6ctn+O Apg3U4Ozam4VzfgggmNgWpBFB9WtTMCclrm1uL3yC3JBs/Z+1a+PArBMbkyVp39qLn CLg0V1bIynjKzzjjUn+0LnGyMuteAAgxofKJ16bE= Received: from smtp57.i.mail.ru (smtp57.i.mail.ru [217.69.128.37]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 4AC516EC56 for ; Wed, 28 Jul 2021 13:34:27 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 4AC516EC56 Received: by smtp57.i.mail.ru with esmtpa (envelope-from ) id 1m8gtO-0008Bz-AM; Wed, 28 Jul 2021 13:34:26 +0300 To: v.shpilevoy@tarantool.org Date: Wed, 28 Jul 2021 13:34:03 +0300 Message-Id: X-Mailer: git-send-email 2.29.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD941C43E597735A9C366EE405EC28A2001F8302D8429E0DE58182A05F53808504044A2EEF81773B175F55C4BACBDAC6E1771DA339E3C07B2513EA3F88DF50F9EA5 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7A55EF828EC83F537EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006372CAA106849E7D531EA1F7E6F0F101C6723150C8DA25C47586E58E00D9D99D84E1BDDB23E98D2D38BBCA57AF85F7723F22BAF94F21F286867D894B0C4900D3340CC7F00164DA146DAFE8445B8C89999728AA50765F7900637D0FEED2715E18529389733CBF5DBD5E9C8A9BA7A39EFB766F5D81C698A659EA7CC7F00164DA146DA9985D098DBDEAEC81D471462564A2E19F6B57BC7E6449061A352F6E88A58FB86F5D81C698A659EA73AA81AA40904B5D9A18204E546F3947CD22D25B442375FF1C0837EA9F3D197644AD6D5ED66289B52698AB9A7B718F8C46E0066C2D8992A16725E5C173C3A84C32732327C85447987BA3038C0950A5D36B5C8C57E37DE458B0BC6067A898B09E46D1867E19FE14079C09775C1D3CA48CF3D321E7403792E342EB15956EA79C166A417C69337E82CC275ECD9A6C639B01B78DA827A17800CE74ABCC139FF3F849B731C566533BA786AA5CC5B56E945C8DA X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A213B5FB47DCBC3458834459D11680B5057049CD6077D8DC15EC75EF97C2F9661A X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C7BEA09003D200E0874EBA4B67C114194A65D88ABF6C3868C9C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF824747F4BD2CC0FE699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34F7CC4EA888783AE03F9891619B18F4CC21761FFD7744397172EB5BEDFDF9D69E6B1FFBDE189AD3531D7E09C32AA3244C3D8682561A3E9BC7E325B0B26D29A6A2853296C06374E60283B48618A63566E0 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojiF1u9eOpfTTjvo4oAvVchA== X-Mailru-Sender: B5B6A6EBBD94DAD8C47A93838048902D54E8C5C2A129CF37C5F6AFC09B2C87595F66DA28D904F0CB1EC9E4A2C82A33BC8C24925A86E657CE0C70AEE3C9A96FBAB3D7EE8ED63280BE112434F685709FCF0DA7A0AF5A3A8387 X-Mras: Ok Subject: [Tarantool-patches] [PATCH resend v2 01/11] build: add Christian Hansen c-dt to the build X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Timur Safin via Tarantool-patches Reply-To: Timur Safin Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" * 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