CMakeLists: add boost::locale dependency for client

Signed-off-by: Patrick Donnelly <pdonnell@ibm.com>
(cherry picked from commit db58a29a53833c0a8bb8db7c494b92baee220fbe)

Conflicts:
	src/client/CMakeLists.txt: no legacy headers

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fbca3df54de84ee638e9d2d5453020fb88a23884..e2f82d9cb311984c6f69f2866f7e6958cb6de9e9 100644 (file)
--- 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 b24b335fd884d5a0e663629348c1561900e058e7..cd83dfe6628bd52e4f03896ec1bf5e92bb2e937f 100755 (executable)
--- 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 8897ada7b598725e35f9cada4402d19c6cb8bfc3..956bd0d8f74a75af4ea6cbc015882c5777b182e2 100644 (file)
--- 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
+  )