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 B471A6EC56; Fri, 19 Mar 2021 17:14:43 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org B471A6EC56 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1616163283; bh=BEID/RnW9x4irkn4tXKtE92Oq3Q8u/iw1SAy/M5VexY=; 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=kBDQ6rR81z02Xqc83YWxGKojuoWiVYZXOdyPmqMCA2FhpRTXYaKM/oMHknCU2Ce0t h7l3E25XTSYo1k9LvIgeTCLeucsNzzhI0Mg0/cWtcltMFwSNqjcQeaFmeTXg1WKSbT 2cvvetjwksG0nyyQibcO65NSiQqXZozauBz9tHy8= Received: from smtpng1.m.smailru.net (smtpng1.m.smailru.net [94.100.181.251]) (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 627F06F3C9 for ; Fri, 19 Mar 2021 17:13:13 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 627F06F3C9 Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1lNFsG-0002rZ-Qe; Fri, 19 Mar 2021 17:13:13 +0300 To: tarantool-patches@dev.tarantool.org Cc: alexander.turenko@tarantool.org Date: Fri, 19 Mar 2021 17:13:08 +0300 Message-Id: <20210319141308.98726-4-roman.habibov@tarantool.org> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20210319141308.98726-1-roman.habibov@tarantool.org> References: <20210319141308.98726-1-roman.habibov@tarantool.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD95D6E7CC48CB1F5F1C82687294EF6886B62CC997B0B8C95C4182A05F538085040DAF8EDA35284F863F164CFC5E9275FF322EE7F2B4CD166A1C3A3C94FB4ADDEDF X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7081BBE264C6D7F42EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006379428F6EA0D091379EA1F7E6F0F101C67CDEEF6D7F21E0D1D174C73DBBBFC7664C47072537531BC37979D6E01CC376E358DC225852F24AB06389733CBF5DBD5E913377AFFFEAFD269176DF2183F8FC7C091DAD9F922AA71188941B15DA834481FCF19DD082D7633A0EF3E4896CB9E6436389733CBF5DBD5E9D5E8D9A59859A8B6D52CD31C43BF465FCC7F00164DA146DA6F5DAA56C3B73B23C77107234E2CFBA567F23339F89546C55F5C1EE8F4F765FCC45105550EA7A2F275ECD9A6C639B01BBD4B6F7A4D31EC0BC0CAF46E325F83A522CA9DD8327EE493B89ED3C7A628178189424AA0EF8DE9BAC4224003CC836476C0CAF46E325F83A50BF2EBBBDD9D6B0F05F538519369F3743B503F486389A921A5CC5B56E945C8DA X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C81A23F326053F8273F8D59B0545EA30AA5A79BFD430D19869C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF0417BEADF48D1460699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D3458239C6F30CE7ACF65482CCF1504FC0ACEB0924BF0BF305BC0F6EB6CFA6CD9127DE30390A57712631D7E09C32AA3244C0CDE0AC1AAB59BA36587DEFCB95183FBA995755A1445935E729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojyKyJYJ15DtLDIVtNci3ZpQ== X-Mailru-Sender: 689FA8AB762F73936BC43F508A0638225C5E7D543D587F6E072697B339BE4E970F96A0E8EF440D4CA021B31A5B48C7CFFB559BB5D741EB9609AE011F3211FEEF240331F90058701C67EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH 3/3] 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. --- CMakeLists.txt | 7 +++++++ rpm/tarantool.spec | 9 +++++++++ 2 files changed, 16 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e2ddb503..263d455fb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -347,6 +347,13 @@ else() find_package(CURL) endif() +# Install headers. +if (ENABLE_BUNDLED_LIBCURL) + install(DIRECTORY "${CURL_INCLUDE_DIRS}/curl" + DESTINATION ${MODULE_FULL_INCLUDEDIR} + FILES_MATCHING PATTERN "*.h") +endif() + # # Export libcurl symbols if the library is bundled. # diff --git a/rpm/tarantool.spec b/rpm/tarantool.spec index cbc97606b..12997f191 100644 --- a/rpm/tarantool.spec +++ b/rpm/tarantool.spec @@ -251,6 +251,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)