From c4d70795000a5b86369d3783c4b8dcec590a8e8d Mon Sep 17 00:00:00 2001
From: Sergey Bronnikov <sergeyb@tarantool.org>
Date: Mon, 29 Jul 2024 17:04:44 +0300
Subject: [PATCH] cmake: fix building statically by Ninja
An attempt to build Tarantool statically by Ninja (with the
enabled CMake option BUILD_STATIC_WITH_BUNDLED_LIBS), error below
is produced:
| ninja: error: build.ninja:1405: bad $-escape
| (literal $ must be written as $$)
The commit fixes that error. Follows up commit c92a1699d6c8
("cmake: support build using Ninja").
NO_CHANGELOG=build
NO_DOC=build
NO_TEST=build
(cherry picked from commit d48c40e69495b8cc3475ea0b184768054d87b780)
---
cmake/BuildICU.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmake/BuildICU.cmake b/cmake/BuildICU.cmake
index 28bb6087db..4102b4ab98 100644
--- a/cmake/BuildICU.cmake
+++ b/cmake/BuildICU.cmake
@@ -40,7 +40,7 @@ ExternalProject_Add(bundled-icu-project
--disable-tests
--disable-samples
INSTALL_COMMAND
- $(MAKE) install &&
+ ${CMAKE_MAKE_PROGRAM} install &&
${CMAKE_COMMAND} -E touch <BINARY_DIR>/uconfig.h &&
cat <BINARY_DIR>/uconfig.h.prepend <INSTALL_DIR>/include/unicode/uconfig.h >> <BINARY_DIR>/uconfig.h &&
${CMAKE_COMMAND} -E copy_if_different <BINARY_DIR>/uconfig.h <INSTALL_DIR>/include/unicode/uconfig.h
--
GitLab