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 BF13D6EC56; Fri, 19 Mar 2021 16:47:03 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org BF13D6EC56 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1616161623; bh=wiAN1A7c85JndDbHcQXQpJZTDALPOzUTqHvVs9TnWR0=; h=To:Cc:Date:In-Reply-To:References:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=tfsY7ZlCNXip6sgzKMmRIt6hd6HWAzS0UONubUpn8hVb/78aC+wPre7UjsGON4PVm X3P0PsuFOndkumosvY09eB/VvSH9fk4WON4yrodeOtl/A3gv5aKF+udAeUtsWJFV4W EUOidNbFsabbqVYTTzAZ9SYKt0IgtUAjKgfl/zr4= Received: from smtpng2.m.smailru.net (smtpng2.m.smailru.net [94.100.179.3]) (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 ED4BB6EC57 for ; Fri, 19 Mar 2021 16:45:59 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org ED4BB6EC57 Received: by smtpng2.m.smailru.net with esmtpa (envelope-from ) id 1lNFRv-0004mg-C1; Fri, 19 Mar 2021 16:45:59 +0300 To: tarantool-patches@dev.tarantool.org Cc: alexander.turenko@tarantool.org Date: Fri, 19 Mar 2021 16:45:55 +0300 Message-Id: <20210319134555.71396-3-roman.habibov@tarantool.org> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20210319134555.71396-1-roman.habibov@tarantool.org> References: <20210319134555.71396-1-roman.habibov@tarantool.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-7564579A: EEAE043A70213CC8 X-77F55803: 4F1203BC0FB41BD95D6E7CC48CB1F5F111116110879554077ED795A4341E98F3182A05F53808504084590BC889D7F1F12AE0A2E3CDEA6D78C5D28278BA4C50209000C0D85469333C X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE74FC7AD0AD96C1577EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006374F960C921106F05B8638F802B75D45FF914D58D5BE9E6BC131B5C99E7648C95C81A23F326053F8279AE1A535111DE954AB6C9FA309719319A471835C12D1D9774AD6D5ED66289B5278DA827A17800CE709B92020B71E24959FA2833FD35BB23D2EF20D2F80756B5F868A13BD56FB6657A471835C12D1D977725E5C173C3A84C3E97D2AE7161E217F117882F4460429728AD0CFFFB425014E868A13BD56FB6657A7F4EDE966BC389F9E8FC8737B5C2249221D5A8161B58CB575ECD9A6C639B01BBD4B6F7A4D31EC0BC0CAF46E325F83A522CA9DD8327EE493B89ED3C7A6281781D2457FAF19517CF2C4224003CC836476C0CAF46E325F83A50BF2EBBBDD9D6B0F05F538519369F3743B503F486389A921A5CC5B56E945C8DA X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C81A23F326053F8279AE1A535111DE954AB6C9FA3097193199C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EFF532FBFD8162E58C699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34E20F2278F74481A1DA942FA62C3C23C1BFDEB8F6A6B5FF344EF4C76674072FBA1A91BDB6EF6614461D7E09C32AA3244CD5C0A8B7F02101B7117CA5BD31641A7533C9DC155518937F729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojyKyJYJ15DtIsKCcGQLJaaQ== X-Mailru-Sender: 689FA8AB762F73936BC43F508A063822EA83A8383751AC3ED9D3916F089F1FB30F96A0E8EF440D4CA021B31A5B48C7CFFB559BB5D741EB9609AE011F3211FEEF240331F90058701C67EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH 2/2] build: install libCURL headers 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: Roman Khabibov via Tarantool-patches Reply-To: Roman Khabibov Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Ship libCURL headers to system path "include/tarantool" in the case of libCURL included as bundled library or static build. --- CMakeLists.txt | 7 +++++++ changelogs/unreleased/install-headers.md | 4 ++++ rpm/tarantool.spec | 9 +++++++++ 3 files changed, 20 insertions(+) create mode 100755 changelogs/unreleased/install-headers.md diff --git a/CMakeLists.txt b/CMakeLists.txt index feb56dfca..005fe0cd7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -428,6 +428,13 @@ else() find_package(CURL) endif() +# Install headers. +if (ENABLE_BUNDLED_LIBCURL OR BUILD_STATIC) + install(DIRECTORY "${CURL_INCLUDE_DIRS}/curl" + DESTINATION ${MODULE_FULL_INCLUDEDIR} + FILES_MATCHING PATTERN "*.h") +endif() + # # Export libcurl symbols if the library is linked statically. # diff --git a/changelogs/unreleased/install-headers.md b/changelogs/unreleased/install-headers.md new file mode 100755 index 000000000..4494a14c8 --- /dev/null +++ b/changelogs/unreleased/install-headers.md @@ -0,0 +1,4 @@ +## feature/build + +* Ship libCURL headers to system path "include/tarantool" in the +case of libCURL included as bundled library or static build (gh-####). \ No newline at end of file diff --git a/rpm/tarantool.spec b/rpm/tarantool.spec index 92e693955..d19df8925 100644 --- a/rpm/tarantool.spec +++ b/rpm/tarantool.spec @@ -268,6 +268,15 @@ fi %{_includedir}/tarantool/luajit.h %{_includedir}/tarantool/lualib.h %{_includedir}/tarantool/module.h +%{_includedir}/tarantool/curl/curl.h +%{_includedir}/tarantool/curl/curlver.h +%{_includedir}/tarantool/curl/easy.h +%{_includedir}/tarantool/curl/mprintf.h +%{_includedir}/tarantool/curl/multi.h +%{_includedir}/tarantool/curl/stdcheaders.h +%{_includedir}/tarantool/curl/system.h +%{_includedir}/tarantool/curl/typecheck-gcc.h +%{_includedir}/tarantool/curl/urlapi.h %changelog * Tue Sep 12 2017 Roman Tsisyk 1.7.5.46-1 -- 2.24.3 (Apple Git-128)