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 4C0006EC5F; Mon, 2 Aug 2021 03:42:03 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 4C0006EC5F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1627864923; 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=XmMmP2YskBwsDMEWaCssG21O77KtvGJMS61FG6GdfizGRrcUqGwbjvbNcgfbMqaR4 ae8ZuQnoO2/nJlOggAXHJNn6bMcN3vsCyG2cUCh3DLOpWZG+tCu4oGpOI9gvgJWwap uaIu7wAEDl8PapEy7+5uZpo05XSqbffaiVi4O41Q= Received: from smtp58.i.mail.ru (smtp58.i.mail.ru [217.69.128.38]) (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 39C6B6EC5F for ; Mon, 2 Aug 2021 03:41:30 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 39C6B6EC5F Received: by smtp58.i.mail.ru with esmtpa (envelope-from ) id 1mAM1I-0000PY-VB; Mon, 02 Aug 2021 03:41:29 +0300 To: v.shpilevoy@tarantool.org, olegrok@tarantool.org Date: Mon, 2 Aug 2021 03:40:57 +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: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD941C43E597735A9C351B198F4576AC7B21928AAE70459C21B182A05F5380850408E7E4103942958D0ED67C8A5E7FA311BD672343F2DC4F29339EC2475824770BB X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE789DCD78EC958A690EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F790063733FC5EB6BC71B5CC8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8DF64B3B63ABFD2F51B5BEB1244FE5AE3117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC8C7ADC89C2F0B2A5A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD18CB629EEF1311BF91D2E47CDBA5A96583BA9C0B312567BB2376E601842F6C81A19E625A9149C048EE599709FD55CB46A6D94E105876FE7799D8FC6C240DEA7642DBF02ECDB25306B2B78CF848AE20165D0A6AB1C7CE11FEE36A1CB4668A9CA5FA03F1AB874ED89028C4224003CC836476EA7A3FFF5B025636E2021AF6380DFAD1A18204E546F3947CB11811A4A51E3B096D1867E19FE1407959CC434672EE6371089D37D7C0E48F6C8AA50765F7900637B8F435DEDE9E76EBEFF80C71ABB335746BA297DBC24807EABDAD6C7F3747799A X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A213B5FB47DCBC3458F0AFF96BAACF4158235E5A14AD4A4A4625E192CAD1D9E79DB53CE843736870897E575B11FFF1C0A9 X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C85811CA530B5049129F9104CFE4AA7DE11D41AA8DB34017B9C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF03D88DA7F5FEDC25699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D3454548929AF40B428CBDE207B6A3ABA354E8065BAE364D449CD4915F7ED0799A38978BFB4E9C12B8F1D7E09C32AA3244CAB6AA199ADAE5B9A2E3C6F79590EACCB795D98D676DD64D08D5DD81C2BAB7D1D X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojMCfuYI4Predt3AW8PRLdHA== X-Mailru-Sender: B5B6A6EBBD94DAD8315E1362B7B20B880BC594E943B4A01080DADE4B61A702D004D5667F35E5B9D95C2808D6142752370A8ED71B308007E3DC85537438B7E1A423D748DE48713E689437F6177E88F7363CDA0F3B3F5B9367 X-Mras: Ok Subject: [Tarantool-patches] [PATCH v3 1/9] 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