From 930c746317fc79196463372e96bdd93fd0a18f59 Mon Sep 17 00:00:00 2001
From: "Alexander V. Tikhonov" <avtikhon@tarantool.org>
Date: Fri, 17 Apr 2020 16:16:32 +0300
Subject: [PATCH] build: fix build with CMake 2
Found that some package builds failed on the mistake in CMakeLists.txt
file, the failed packages and test builds were:
- CentOS 6
- CentOS 7
- Ubuntu 14.04
and static build based on Dockerfile.
The core of the issue is that CMake 2 does not support line continuation
with backslash.
The commit fixes the regression from
7b443650d4bef5593f12a78f82d081d6c571c25c ('feedback: add cmake option to
disable the daemon').
Follow up #3308
---
src/box/CMakeLists.txt | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/box/CMakeLists.txt b/src/box/CMakeLists.txt
index 5ed7eaead0..42b86f22ba 100644
--- a/src/box/CMakeLists.txt
+++ b/src/box/CMakeLists.txt
@@ -3,8 +3,7 @@ file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/src/box/lua)
# Sometimes 'spying' code is not acceptable even if it would be
# disabled by default. That option allows to remove the feedback
# daemon from the build completely.
-option(ENABLE_FEEDBACK_DAEMON "Feedback daemon which reports debug data to \
-the Tarantool team" ON)
+option(ENABLE_FEEDBACK_DAEMON "Feedback daemon which reports debug data to the Tarantool team" ON)
add_subdirectory(sql)
--
GitLab