From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtpng3.m.smailru.net (smtpng3.m.smailru.net [94.100.177.149]) (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 8A0B34765E0 for ; Thu, 24 Dec 2020 14:28:42 +0300 (MSK) References: <20201222161725.37048-1-roman.habibov@tarantool.org> From: Sergey Bronnikov Message-ID: Date: Thu, 24 Dec 2020 14:28:40 +0300 MIME-Version: 1.0 In-Reply-To: <20201222161725.37048-1-roman.habibov@tarantool.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US Subject: Re: [Tarantool-patches] [PATCH] build: install curl headers List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Roman Khabibov , tarantool-patches@dev.tarantool.org Cc: alexander.turenko@tarantool.org Hi, thanks for the patch! On 22.12.2020 19:17, Roman Khabibov via Tarantool-patches wrote: > Ship curl headers to system path include/tarantool. 1. could you add issue number to the commit message? > --- > > Issue: https://github.com/tarantool/smtp/issues/24 2. looks like this patch is only a part of a task, is it so? > Bracnh: https://github.com/tarantool/tarantool/tree/romanhabibov/curl-headers > > cmake/BuildLibCURL.cmake | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/cmake/BuildLibCURL.cmake b/cmake/BuildLibCURL.cmake > index 39a1d62fd..8fd063454 100644 > --- a/cmake/BuildLibCURL.cmake > +++ b/cmake/BuildLibCURL.cmake > @@ -178,6 +178,11 @@ macro(curl_build) > set(CURL_LIBRARIES ${CURL_LIBRARIES} rt) > endif() > > + # Install headers. > + install(DIRECTORY "${CURL_INCLUDE_DIRS}/curl" > + DESTINATION ${MODULE_FULL_INCLUDEDIR} > + FILES_MATCHING PATTERN "*.h") > + > unset(FOUND_ZLIB_ROOT_DIR) > unset(FOUND_OPENSSL_ROOT_DIR) > unset(LIBCURL_INSTALL_DIR) I build tarantool with custom PREFIX dirs: cmake --install /home/s.bronnikov/work/tarantool_prefix_path \ -DCMAKE_PREFIX_PATH=/home/s.bronnikov/work/tarantool_prefix_path \ -DCMAKE_INSTALL_PREFIX=/home/s.bronnikov/work/tarantool_prefix_path .. and it seems set of installed headers are the same as in libcurl-devel package: [s.bronnikov@tarantool-core-dev-mcs1 build]$ find /home/s.bronnikov/work/tarantool_prefix_path/include/tarantool/curl -name "*.h" /home/s.bronnikov/work/tarantool_prefix_path/include/tarantool/curl/mprintf.h /home/s.bronnikov/work/tarantool_prefix_path/include/tarantool/curl/system.h /home/s.bronnikov/work/tarantool_prefix_path/include/tarantool/curl/multi.h /home/s.bronnikov/work/tarantool_prefix_path/include/tarantool/curl/curl.h /home/s.bronnikov/work/tarantool_prefix_path/include/tarantool/curl/urlapi.h /home/s.bronnikov/work/tarantool_prefix_path/include/tarantool/curl/stdcheaders.h /home/s.bronnikov/work/tarantool_prefix_path/include/tarantool/curl/curlver.h /home/s.bronnikov/work/tarantool_prefix_path/include/tarantool/curl/typecheck-gcc.h /home/s.bronnikov/work/tarantool_prefix_path/include/tarantool/curl/easy.h [s.bronnikov@tarantool-core-dev-mcs1 build]$ rpm -ql libcurl-devel.x86_64 | grep "/usr/include/" /usr/include/curl /usr/include/curl/curl.h /usr/include/curl/curlver.h /usr/include/curl/easy.h /usr/include/curl/mprintf.h /usr/include/curl/multi.h /usr/include/curl/stdcheaders.h /usr/include/curl/system.h /usr/include/curl/typecheck-gcc.h /usr/include/curl/urlapi.h