Re: [Tarantool-patches] [PATCH v1] gitlab-ci: add out-of-source build

[Igor Munkin <imun@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