[Tarantool-patches] [PATCH 3/3] build: install libCURL headers
Roman Khabibov
roman.habibov at tarantool.org
Fri Apr 9 22:54:58 MSK 2021
> On Apr 1, 2021, at 03:10, Alexander Turenko <alexander.turenko at tarantool.org> wrote:
>
> On Fri, Mar 19, 2021 at 05:13:08PM +0300, Roman Khabibov wrote:
>> Ship libCURL headers to system path "include/tarantool" in the
>> case of libCURL included as bundled library.
>> ---
>
> Is it quite straigtforward backport of [1], so it is okay too after the
> proposed fixes [2].
>
> Only one note for the backport: it seems, a changelog entry was
> forgotten here.
>
> [1]: https://lists.tarantool.org/pipermail/tarantool-patches/2021-March/022798.html
> [2]: https://lists.tarantool.org/pipermail/tarantool-patches/2021-March/023178.html
>
> WBR, Alexander Turenko.
commit 3fd88650bd4bbe6d0bbbfa5fbedd38dc5d9f1578
Author: Roman Khabibov <roman.habibov at tarantool.org>
Date: Sun Dec 20 13:08:40 2020 +0500
build: install libcurl headers
Ship libcurl headers to system path "${PREFIX}/include/tarantool"
in the case of libcurl included as bundled library.
Closes #4559
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..fa521e47b 100644
--- a/rpm/tarantool.spec
+++ b/rpm/tarantool.spec
@@ -251,6 +251,7 @@ fi
%{_includedir}/tarantool/luajit.h
%{_includedir}/tarantool/lualib.h
%{_includedir}/tarantool/module.h
+%{_includedir}/tarantool/curl
%changelog
* Tue Sep 12 2017 Roman Tsisyk <roman at tarantool.org> 1.7.5.46-1
More information about the Tarantool-patches
mailing list