From db58a29a53833c0a8bb8db7c494b92baee220fbe Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Tue, 31 Dec 2024 12:59:12 -0500 Subject: [PATCH] CMakeLists: add boost::locale dependency for client Signed-off-by: Patrick Donnelly --- CMakeLists.txt | 5 +++++ install-deps.sh | 1 + src/client/CMakeLists.txt | 6 +++++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2db321bed35..e2aa1016896 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -729,6 +729,11 @@ if(WITH_RADOSGW AND WITH_RADOSGW_LUA_PACKAGES) list(APPEND BOOST_COMPONENTS filesystem) endif() +if(WITH_LIBCEPHFS) + find_package(ICU REQUIRED COMPONENTS uc i18n) + list(APPEND BOOST_COMPONENTS locale) +endif() + set(Boost_USE_MULTITHREADED ON) CMAKE_DEPENDENT_OPTION(WITH_BOOST_VALGRIND "Boost support for valgrind" OFF diff --git a/install-deps.sh b/install-deps.sh index 75d8a0407fd..48193ce18c4 100755 --- a/install-deps.sh +++ b/install-deps.sh @@ -207,6 +207,7 @@ function install_boost_on_ubuntu { ceph-libboost-date-time${boost_ver}-dev \ ceph-libboost-filesystem${boost_ver}-dev \ ceph-libboost-iostreams${boost_ver}-dev \ + ceph-libboost-locale${boost_ver}-dev \ ceph-libboost-program-options${boost_ver}-dev \ ceph-libboost-python${boost_ver}-dev \ ceph-libboost-random${boost_ver}-dev \ diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt index ddc77c66147..b71e641e440 100644 --- a/src/client/CMakeLists.txt +++ b/src/client/CMakeLists.txt @@ -12,4 +12,8 @@ set(libclient_srcs add_library(client STATIC ${libclient_srcs}) target_link_libraries(client legacy-option-headers - osdc) + osdc + Boost::locale + ICU::uc + ICU::i18n + ) -- 2.39.5