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

Merge branch 'master' of github.com:mailru/tarantool

parents 2d5961ae b14741fa
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
CMakeLists.txt
+ 2
− 1
View file @ d065358f
...@@ -123,7 +123,8 @@ set (PACKAGE_VERSION "") ...@@ -123,7 +123,8 @@ set (PACKAGE_VERSION "")
if (EXISTS "${CMAKE_SOURCE_DIR}/.git") if (EXISTS "${CMAKE_SOURCE_DIR}/.git")
execute_process (COMMAND ${GIT} describe HEAD execute_process (COMMAND ${GIT} describe HEAD
OUTPUT_VARIABLE PACKAGE_VERSION OUTPUT_VARIABLE PACKAGE_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
if (PACKAGE_VERSION STREQUAL "") if (PACKAGE_VERSION STREQUAL "")
message (FATAL_ERROR "Failed to retrive git version.") message (FATAL_ERROR "Failed to retrive git version.")
endif() endif()
......
src/box/CMakeLists.txt
+ 1
− 0
View file @ d065358f
...@@ -18,6 +18,7 @@ function(lua_source filename) ...@@ -18,6 +18,7 @@ function(lua_source filename)
PARENT_SCOPE) PARENT_SCOPE)
endfunction() endfunction()
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/src/box/lua)
lua_source(lua/box.lua) lua_source(lua/box.lua)
lua_source(lua/box_net.lua) lua_source(lua/box_net.lua)
lua_source(lua/misc.lua) lua_source(lua/misc.lua)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment