From: Roman Khabibov via Tarantool-patches <tarantool-patches@dev.tarantool.org>
To: tarantool-patches@dev.tarantool.org
Cc: alexander.turenko@tarantool.org
Subject: [Tarantool-patches] [PATCH 3/3] build: install iibCURL headers
Date: Thu, 18 Mar 2021 11:51:54 +0300 [thread overview]
Message-ID: <20210318085154.31634-4-roman.habibov@tarantool.org> (raw)
In-Reply-To: <20210318085154.31634-1-roman.habibov@tarantool.org>
Ship libCURL headers to system path "include/tarantool" in the
case of libCURL included as bundled library or static build.
---
CMakeLists.txt | 7 +++++++
rpm/tarantool.spec | 9 +++++++++
2 files changed, 16 insertions(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5990d026e..0d7d086c5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -347,6 +347,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 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 <roman@tarantool.org> 1.7.5.46-1
--
2.24.3 (Apple Git-128)
prev parent reply other threads:[~2021-03-18 8:53 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-18 8:51 [Tarantool-patches] [PATCH 0/3] Install iibCURL headers and export libCURL symbols for 1.10 Roman Khabibov via Tarantool-patches
2021-03-18 8:51 ` [Tarantool-patches] [PATCH 1/3] build: export libCURL symbols Roman Khabibov via Tarantool-patches
2021-03-18 8:51 ` [Tarantool-patches] [PATCH 2/3] build: enable smtp in libCURL Roman Khabibov via Tarantool-patches
2021-03-18 8:51 ` Roman Khabibov via Tarantool-patches [this message]
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=20210318085154.31634-4-roman.habibov@tarantool.org \
--to=tarantool-patches@dev.tarantool.org \
--cc=alexander.turenko@tarantool.org \
--cc=roman.habibov@tarantool.org \
--subject='Re: [Tarantool-patches] [PATCH 3/3] build: install iibCURL headers' \
/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