From 7b317d9b65fe869549cae5a643f27f940e518ace Mon Sep 17 00:00:00 2001
From: Roman Tsisyk <roman@tsisyk.com>
Date: Mon, 15 Aug 2016 17:46:01 +0300
Subject: [PATCH] Fix compilation with CMake 3.5
---
src/CMakeLists.txt | 3 +--
test/CMakeLists.txt | 4 ++++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bbfafd46ec..d63884ac61 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -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)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index a394e4907a..a77222df5c 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -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)
--
GitLab