Skip to content
Snippets Groups Projects
Commit 7b317d9b authored by Roman Tsisyk's avatar Roman Tsisyk
Browse files

Fix compilation with CMake 3.5

parent 5bf1b71f
No related branches found
No related tags found
No related merge requests found
......@@ -143,7 +143,6 @@ endif()
set_source_files_properties(sio.cc evio.cc replica.cc PROPERTIES COMPILE_FLAGS "-Wno-deprecated")
set_source_files_compile_flags(${common_sources})
add_library(core STATIC ${common_sources})
add_dependencies(core generate_headers)
set (common_libraries cfg core)
......@@ -220,7 +219,7 @@ function(tarantool_module mod)
add_library(lt${mod} STATIC ${recompiled_sources})
set_target_properties(lt${mod} PROPERTIES COMPILE_FLAGS
"-DTARANTOOL_CONFIG='<cfg/tarantool_${mod}_cfg.h>'")
add_dependencies(lt${mod} generate_headers generate_admin_cc generate_memcached_grammar_cc build_bundled_libs)
add_dependencies(lt${mod} generate_admin_cc generate_memcached_grammar_cc build_bundled_libs)
target_link_libraries(tarantool_${mod} lt${mod} ${common_libraries} -rdynamic)
......
......@@ -3,6 +3,10 @@ enable_tnt_compile_flags()
add_compile_flags("C;CXX"
"-Wno-unused-parameter")
if(POLICY CMP0037)
cmake_policy(SET CMP0037 OLD)
endif(POLICY CMP0037)
add_custom_target(test
COMMAND ${PROJECT_SOURCE_DIR}/test/test-run.py --builddir=${PROJECT_BINARY_DIR} --vardir=${PROJECT_BINARY_DIR}/test/var)
......
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