From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp40.i.mail.ru (smtp40.i.mail.ru [94.100.177.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 9474E4696C3 for ; Sat, 18 Apr 2020 06:15:28 +0300 (MSK) Date: Sat, 18 Apr 2020 06:15:22 +0300 From: Alexander Turenko Message-ID: <20200418031522.pxbsr2wq2bicknxe@tkn_work_nb> References: <977f51a8cf1df83bebd3d0f0db79749ef5351a42.1587132510.git.avtikhon@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <977f51a8cf1df83bebd3d0f0db79749ef5351a42.1587132510.git.avtikhon@tarantool.org> Subject: Re: [Tarantool-patches] [PATCH v1] build: fix build after commit 7b443650 List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Alexander V. Tikhonov" Cc: Oleg Piskunov , tarantool-patches@dev.tarantool.org Pushed to master with changes, see below. WBR, Alexander Turenko. On Fri, Apr 17, 2020 at 05:09:47PM +0300, Alexander V. Tikhonov wrote: > 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. It is actually due to CMake 2 and CMake 3 differences. > The core of the issue appeared to be single backslash instead of double > at the comment in CMakeLists.txt file, which should pass the cmake > syntax rules. I would stay on safe side and just don't carry the line. See, `cmake` -LAH outputs on cmake 3.16: // Feedback daemon which reports debug data to\ the Tarantool team ENABLE_FEEDBACK_DAEMON:BOOL=ON Your way adds literal newline to the option help string on CMake 3. Don't sure how it would work with, say, some external tools (an IDE?). I look over similar issues in another projects and nobody actually carry option() help strings. It is also interesting that newlines are not supported for cached values in CMake 3.11+ (see [1]), however I don't see any warning in our case. That everything looks fragile. I changed the commit to don't carry the line and pushed to master. Hope you don't mind. [1]: https://bitbucket.org/osrf/gazebo/issues/2664/cmake-311-will-stop-supporting-multiline > > Follow up #3308 > --- > > Github: https://github.com/tarantool/tarantool/tree/avtikhon/gh-3308-fix-commit-full-ci > > src/box/CMakeLists.txt | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/box/CMakeLists.txt b/src/box/CMakeLists.txt > index 5ed7eaead..d4abccc82 100644 > --- a/src/box/CMakeLists.txt > +++ b/src/box/CMakeLists.txt > @@ -3,7 +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 \ > +option(ENABLE_FEEDBACK_DAEMON "Feedback daemon which reports debug data to \\ > the Tarantool team" ON) > > add_subdirectory(sql) > -- > 2.17.1 >