Skip to content

Commit 30e0c0e

Browse files
committed
Merge PR ceph#62108 into main
* refs/pull/62108/head: cmake/cephfs: fix options to enable client and dependencies Reviewed-by: Krunal Chheda <[email protected]> Reviewed-by: Adam C. Emerson <[email protected]> Reviewed-by: Patrick Donnelly <[email protected]>
2 parents b0890e3 + 70eb1d6 commit 30e0c0e

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

.githubmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,3 +193,4 @@ spuiuk Sachin Prabhu <[email protected]>
193193
anoopcs9 Anoop C S <[email protected]>
194194
dubeyko Viacheslav Dubeyko <[email protected]>
195195
bill-scales Bill Scales <[email protected]>
196+
kchheda3 Krunal Chheda <[email protected]>

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -729,7 +729,7 @@ if(WITH_RADOSGW AND WITH_RADOSGW_LUA_PACKAGES)
729729
list(APPEND BOOST_COMPONENTS filesystem)
730730
endif()
731731

732-
if(WITH_LIBCEPHFS)
732+
if(WITH_LIBCEPHFS OR WITH_FUSE)
733733
find_package(ICU REQUIRED COMPONENTS uc i18n)
734734
list(APPEND BOOST_COMPONENTS locale)
735735
endif()

src/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -833,7 +833,10 @@ install(PROGRAMS
833833
DESTINATION sbin)
834834

835835
add_subdirectory(bash_completion)
836-
add_subdirectory(client)
836+
837+
if(WITH_LIBCEPHFS OR WITH_FUSE)
838+
add_subdirectory(client)
839+
endif()
837840

838841
if(WITH_LIBCEPHFS)
839842
set(libcephfs_srcs libcephfs.cc)

0 commit comments

Comments
 (0)