Skip to content
Snippets Groups Projects
Commit 80159117 authored by Konstantin Osipov's avatar Konstantin Osipov
Browse files

Fix travis build error (race condition between src/ and box/).

parent 320752d1
No related branches found
No related tags found
No related merge requests found
......@@ -37,7 +37,7 @@ extra/rpm.spec
src/trivia/config.h
install_manifest.txt
lcov
src/bootstrap.h
src/box/bootstrap.h
src/lua/*.lua.c
src/box/lua/*.lua.c
src/tarantool
......
......@@ -26,8 +26,6 @@ lua_source(lua_sources lua/bsdsocket.lua)
lua_source(lua_sources lua/errno.lua)
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/third_party/luafun)
lua_source(lua_sources ../third_party/luafun/fun.lua)
set(bin_sources)
bin_source(bin_sources bootstrap.snap bootstrap.h)
add_custom_target(generate_lua_sources
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src/box
......@@ -88,7 +86,6 @@ set (common_sources
lua/errno.c
lua/bsdsocket.cc
${lua_sources}
${bin_sources}
)
if (ENABLE_TRACE)
......
......@@ -8,6 +8,8 @@ lua_source(lua_sources lua/box.lua)
lua_source(lua_sources lua/box_net.lua)
lua_source(lua_sources lua/misc.lua)
lua_source(lua_sources lua/tuple.lua)
set(bin_sources)
bin_source(bin_sources bootstrap.snap bootstrap.h)
add_custom_target(box_generate_lua_sources
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src/box
......@@ -47,4 +49,5 @@ add_library(box
lua/tuple.cc
lua/slab.cc
lua/index.cc
lua/space.cc)
lua/space.cc
${bin_sources})
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment