From 0f7e115390f4d9cda36352b0ff8693b81dbe49b2 Mon Sep 17 00:00:00 2001 From: Konstantin Osipov <kostja@tarantool.org> Date: Tue, 20 Aug 2013 22:34:28 +0400 Subject: [PATCH] Fix broken out-of-source build (got broken by bin2c utility). --- cmake/utils.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmake/utils.cmake b/cmake/utils.cmake index c6a24f1a05..660ea4d1ef 100644 --- a/cmake/utils.cmake +++ b/cmake/utils.cmake @@ -57,12 +57,14 @@ function(lua_source varname filename) endfunction() function(bin_source varname srcfile dstfile) + set (srcfile "${CMAKE_CURRENT_SOURCE_DIR}/${filename}") set (tmpfile "${CMAKE_CURRENT_BINARY_DIR}/${dstfile}.tmp") + set (dstfile "${CMAKE_CURRENT_BINARY_DIR}/${dstfile}") get_filename_component(module ${dstfile} NAME_WE) ADD_CUSTOM_COMMAND(OUTPUT ${dstfile} COMMAND ${ECHO} 'const unsigned char ${module}_bin[] = {' > ${tmpfile} - COMMAND ${CMAKE_BINARY_DIR}/extra/bin2c ${srcfile} >> ${tmpfile} + COMMAND ${CMAKE_BINARY_DIR}/extra/bin2c "${srcfile}" >> ${tmpfile} COMMAND ${ECHO} '}\;' >> ${tmpfile} COMMAND ${CMAKE_COMMAND} -E copy_if_different ${tmpfile} ${dstfile} COMMAND ${CMAKE_COMMAND} -E remove ${tmpfile} -- GitLab