diff options
author | CoprDistGit <infra@openeuler.org> | 2024-08-01 14:30:39 +0000 |
---|---|---|
committer | CoprDistGit <infra@openeuler.org> | 2024-08-01 14:30:39 +0000 |
commit | bc7af7d37a7cb36255ae480b323a0f8cdfe14749 (patch) | |
tree | fce5864408c549b5091fcd3f19a3f745cb6769d2 /0016-cmake-link-bundled-fmt-statically.patch | |
parent | 20b104feb51b39a0c5fd34dcc635128075eb46b4 (diff) |
automatic import of cephopeneuler24.03_LTSopeneuler23.09
Diffstat (limited to '0016-cmake-link-bundled-fmt-statically.patch')
-rw-r--r-- | 0016-cmake-link-bundled-fmt-statically.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/0016-cmake-link-bundled-fmt-statically.patch b/0016-cmake-link-bundled-fmt-statically.patch new file mode 100644 index 0000000..70d2bcd --- /dev/null +++ b/0016-cmake-link-bundled-fmt-statically.patch @@ -0,0 +1,32 @@ +From 1207906fcf005812f1d861e7bf577a1dc2d1e053 Mon Sep 17 00:00:00 2001 +From: Boris Ranto <branto@redhat.com> +Date: Thu, 5 Aug 2021 15:59:39 +0200 +Subject: [PATCH] cmake: link bundled fmt statically + +instead of building the bundled fmt library as shared library, built +static library. otherwise we'd have to link against libfmt.so. + +Signed-off-by: Kefu Chai <kchai@redhat.com> +--- + src/CMakeLists.txt | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index c4d73633ed8..b1a9001e744 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -310,7 +310,11 @@ if(fmt_FOUND) + include_directories(SYSTEM "${fmt_INCLUDE_DIR}") + else() + message(STATUS "Could not find fmt, will build it") ++ set(old_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS}) ++ set(BUILD_SHARED_LIBS FALSE) + add_subdirectory(fmt) ++ set(BUILD_SHARED_LIBS ${old_BUILD_SHARED_LIBS}) ++ unset(old_BUILD_SHARED_LIBS) + include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/src/fmt/include") + endif() + +-- +2.31.1 + |