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 2/2] build: install libCURL headers
Date: Fri, 19 Mar 2021 16:45:55 +0300 [thread overview]
Message-ID: <20210319134555.71396-3-roman.habibov@tarantool.org> (raw)
In-Reply-To: <20210319134555.71396-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 +++++++
| 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.
#
--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 <roman@tarantool.org> 1.7.5.46-1
--
2.24.3 (Apple Git-128)
next prev parent reply other threads:[~2021-03-19 13:47 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-19 13:45 [Tarantool-patches] [PATCH 0/2] Install curl headers and enable smtp Roman Khabibov via Tarantool-patches
2021-03-19 13:45 ` [Tarantool-patches] [PATCH 1/2] build: " Roman Khabibov via Tarantool-patches
2021-03-30 23:13 ` Alexander Turenko via Tarantool-patches
2021-04-09 19:55 ` Roman Khabibov via Tarantool-patches
2021-04-12 10:01 ` Leonid Vasiliev via Tarantool-patches
2021-03-19 13:45 ` Roman Khabibov via Tarantool-patches [this message]
2021-03-30 23:14 ` [Tarantool-patches] [PATCH 2/2] build: install libCURL headers Alexander Turenko via Tarantool-patches
2021-04-09 19:55 ` Roman Khabibov via Tarantool-patches
2021-04-12 13:14 ` Leonid Vasiliev via Tarantool-patches
2021-04-15 0:28 ` [Tarantool-patches] [PATCH 0/2] Install curl headers and enable smtp Alexander Turenko via Tarantool-patches
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=20210319134555.71396-3-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 2/2] build: install libCURL 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