diff --git a/CMakeLists.txt b/CMakeLists.txt index feb56dfca05577439608365521f04ab1d9cd0b9d..1196b65b9f9d450293f1c3e8f31119172904aa77 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -428,6 +428,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 linked statically. # diff --git a/changelogs/unreleased/install-headers.md b/changelogs/unreleased/install-headers.md new file mode 100755 index 0000000000000000000000000000000000000000..957574c05315e0b107d1c40f49b1bdcc933913c9 --- /dev/null +++ b/changelogs/unreleased/install-headers.md @@ -0,0 +1,4 @@ +## feature/build + +* Ship libcurl headers to system path "${PREFIX}/include/tarantool" in the + case of libcurl included as bundled library or static build (gh-4559). diff --git a/rpm/tarantool.spec b/rpm/tarantool.spec index 92e693955b5ad72edfb9c2b96a28a9c127394aae..f8f6c124acdbeb0eacebce38662238d8c2a3dd1d 100644 --- a/rpm/tarantool.spec +++ b/rpm/tarantool.spec @@ -268,6 +268,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@tarantool.org> 1.7.5.46-1