From: Patrick Donnelly Date: Tue, 31 Dec 2024 17:59:12 +0000 (-0500) Subject: CMakeLists: add boost::locale dependency for client X-Git-Tag: v19.2.3~288^2~35 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=569ed13df37a524d4a05f7b3408d4de85930ace7;p=ceph.git CMakeLists: add boost::locale dependency for client Signed-off-by: Patrick Donnelly (cherry picked from commit db58a29a53833c0a8bb8db7c494b92baee220fbe) Conflicts: src/client/CMakeLists.txt: no legacy headers --- diff --git a/CMakeLists.txt b/CMakeLists.txt index fbca3df54de..e2f82d9cb31 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -681,6 +681,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 b24b335fd88..cd83dfe6628 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 8897ada7b59..956bd0d8f74 100644 --- a/src/client/CMakeLists.txt +++ b/src/client/CMakeLists.txt @@ -10,4 +10,9 @@ set(libclient_srcs posix_acl.cc Delegation.cc) add_library(client STATIC ${libclient_srcs}) -target_link_libraries(client osdc) +target_link_libraries(client + osdc + Boost::locale + ICU::uc + ICU::i18n + )