Tarantool development patches archive
 help / color / mirror / Atom feed
From: Igor Munkin <imun@tarantool.org>
To: "Alexander V. Tikhonov" <avtikhon@tarantool.org>
Cc: tarantool-patches@dev.tarantool.org,
	Alexander Turenko <alexander.turenko@tarantool.org>
Subject: Re: [Tarantool-patches] [PATCH v1] gitlab-ci: add out-of-source build
Date: Tue, 13 Oct 2020 23:39:48 +0300	[thread overview]
Message-ID: <20201013203948.GE18920@tarantool.org> (raw)
In-Reply-To: <4996f2a73e39fe0bfd70febc07d36b9b11b9ea31.1602143974.git.avtikhon@tarantool.org>

Sasha,

Thanks for the patch!

On 08.10.20, Alexander V. Tikhonov wrote:
> Implemented out-of-source build at cmake files.
> Added out of source build make targets and added
> test job to gitlab-ci.

Minor: IIRC, commit message body is up to 72 characters width.

> 
> Closes #4874
> ---
> 
> Github: https://github.com/tarantool/tarantool/tree/avtikhon/gh-4874-out-of-source-build-full-ci
> Issue: https://github.com/tarantool/tarantool/issues/4874
> 
>  .gitlab-ci.yml         |  7 +++++++
>  .travis.mk             | 26 +++++++++++++++++++++++++-
>  cmake/utils.cmake      |  4 ++--
>  src/box/CMakeLists.txt |  1 +
>  4 files changed, 35 insertions(+), 3 deletions(-)
> 

<snipped>

I guess the changes below are not related to gitlab-ci, but
out-of-source build per se, are they? If so, please don't mix it here
and move it to a separate patch.

> diff --git a/cmake/utils.cmake b/cmake/utils.cmake
> index 3ab2d3ff2..eaec821b3 100644
> --- a/cmake/utils.cmake
> +++ b/cmake/utils.cmake
> @@ -70,9 +70,9 @@ endfunction()
>  
>  function(bin_source varname srcfile dstfile)
>      set(var ${${varname}})
> -    set(${varname} ${var} ${dstfile} PARENT_SCOPE)
>      set (srcfile "${CMAKE_CURRENT_SOURCE_DIR}/${srcfile}")
> -    set (dstfile "${CMAKE_CURRENT_SOURCE_DIR}/${dstfile}")
> +    set (dstfile "${CMAKE_CURRENT_BINARY_DIR}/${dstfile}")
> +    set(${varname} ${var} "${dstfile}" PARENT_SCOPE)
>      set (tmpfile "${dstfile}.tmp")
>      get_filename_component(module ${dstfile} NAME_WE)
>  
> diff --git a/src/box/CMakeLists.txt b/src/box/CMakeLists.txt
> index 8b2e704cf..6e25401a1 100644
> --- a/src/box/CMakeLists.txt
> +++ b/src/box/CMakeLists.txt
> @@ -77,6 +77,7 @@ set_property(DIRECTORY PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${lua_sources})
>  
>  include_directories(${ZSTD_INCLUDE_DIRS})
>  include_directories(${CMAKE_BINARY_DIR}/src/box/sql)
> +include_directories(${CMAKE_BINARY_DIR}/src/box)

I see no difference in build logs related to these changes.

>  
>  add_library(vclock STATIC vclock.c)
>  target_link_libraries(vclock core bit)
> -- 
> 2.25.1
> 

-- 
Best regards,
IM

  reply	other threads:[~2020-10-13 20:50 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-08  8:03 [Tarantool-patches] [PATCH v3] build: enable cmake in curl build Alexander V. Tikhonov
2020-10-08  8:05 ` [Tarantool-patches] [PATCH v1] build: make curl symbols global Alexander V. Tikhonov
2020-10-13 11:47   ` Igor Munkin
2020-10-08  8:09 ` [Tarantool-patches] [PATCH v1] gitlab-ci: add out-of-source build Alexander V. Tikhonov
2020-10-13 20:39   ` Igor Munkin [this message]
2020-10-14  9:07     ` Alexander V. Tikhonov
2020-10-12 18:52 ` [Tarantool-patches] [PATCH v3] build: enable cmake in curl build Igor Munkin
2020-10-13 10:20   ` Igor Munkin
2020-10-14  9:08     ` Alexander V. Tikhonov
2020-10-14  9:12   ` Alexander V. Tikhonov

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=20201013203948.GE18920@tarantool.org \
    --to=imun@tarantool.org \
    --cc=alexander.turenko@tarantool.org \
    --cc=avtikhon@tarantool.org \
    --cc=tarantool-patches@dev.tarantool.org \
    --subject='Re: [Tarantool-patches] [PATCH v1] gitlab-ci: add out-of-source build' \
    /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