From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <avtikhon@tarantool.org>
Received: from smtp47.i.mail.ru (smtp47.i.mail.ru [94.100.177.107])
 (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 00694469719
 for <tarantool-patches@dev.tarantool.org>;
 Wed, 14 Oct 2020 12:07:06 +0300 (MSK)
Date: Wed, 14 Oct 2020 12:07:04 +0300
From: "Alexander V. Tikhonov" <avtikhon@tarantool.org>
Message-ID: <20201014090704.GA1134582@hpalx>
References: <4fc536691abbbbb9f3439bb60bef7a551663a5b5.1602143974.git.avtikhon@tarantool.org>
 <4996f2a73e39fe0bfd70febc07d36b9b11b9ea31.1602143974.git.avtikhon@tarantool.org>
 <20201013203948.GE18920@tarantool.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20201013203948.GE18920@tarantool.org>
Subject: Re: [Tarantool-patches] [PATCH v1] gitlab-ci: add out-of-source
	build
List-Id: Tarantool development patches <tarantool-patches.dev.tarantool.org>
List-Unsubscribe: <https://lists.tarantool.org/mailman/options/tarantool-patches>, 
 <mailto:tarantool-patches-request@dev.tarantool.org?subject=unsubscribe>
List-Archive: <https://lists.tarantool.org/pipermail/tarantool-patches/>
List-Post: <mailto:tarantool-patches@dev.tarantool.org>
List-Help: <mailto:tarantool-patches-request@dev.tarantool.org?subject=help>
List-Subscribe: <https://lists.tarantool.org/mailman/listinfo/tarantool-patches>, 
 <mailto:tarantool-patches-request@dev.tarantool.org?subject=subscribe>
To: Igor Munkin <imun@tarantool.org>
Cc: tarantool-patches@dev.tarantool.org

Hi Igor, thanks for the review, I've made all your suggestions
and created 2 new separate patches, please check it too.

On Tue, Oct 13, 2020 at 11:39:48PM +0300, Igor Munkin wrote:
> 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