From e1238c810a70cf7dbec4892365e9e4e1ae626480 Mon Sep 17 00:00:00 2001
From: Georgy Moshkin <gmoshkin@picodata.io>
Date: Tue, 20 Dec 2022 17:00:12 +0300
Subject: [PATCH] build: fix tarantool-sys build options
The commit c18fe6e6e is wrong. We've tried to disable building tests,
but:
1. A space in "CMAKE_TARANTOOL_ARGS" was parsed incorrectly.
2. `tarantool-sys/static-build/CMakeFiles.txt` did ignore
`-DBUILD_TESTING` option.
---
build.rs | 2 +-
tarantool-sys | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.rs b/build.rs
index 3dbe6a1f3b..03c9e1fae0 100644
--- a/build.rs
+++ b/build.rs
@@ -57,7 +57,7 @@ fn build_tarantool() {
let dst = cmake::Config::new("tarantool-sys/static-build")
.define(
"CMAKE_TARANTOOL_ARGS",
- "-DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_TESTING=FALSE",
+ "-DCMAKE_BUILD_TYPE=RelWithDebInfo;-DBUILD_TESTING=FALSE;-DBUILD_DOC=FALSE",
)
.build_target("tarantool")
.out_dir(build_dir)
diff --git a/tarantool-sys b/tarantool-sys
index 62bf16f8ae..797bf67b83 160000
--- a/tarantool-sys
+++ b/tarantool-sys
@@ -1 +1 @@
-Subproject commit 62bf16f8aee0e1c73c8b5052bed380df32fcfc3b
+Subproject commit 797bf67b8370b112200ec68410cd85b206aafe0d
--
GitLab