Skip to content

Commit dac3b7d

Browse files
authored
Merge pull request ceph#58416 from cbodley/wip-cmake-zfs
cmake/os: remove WITH_ZFS option Reviewed-by: Igor Fedotov <[email protected]>
2 parents 3f4aee2 + 52be40e commit dac3b7d

File tree

3 files changed

+0
-47
lines changed

3 files changed

+0
-47
lines changed

CMakeLists.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -242,12 +242,6 @@ if(WITH_XFS)
242242
set(HAVE_LIBXFS ${XFS_FOUND})
243243
endif()
244244

245-
option(WITH_ZFS "enable LibZFS if found" OFF)
246-
if(WITH_ZFS)
247-
find_package(zfs)
248-
set(HAVE_LIBZFS ${ZFS_FOUND})
249-
endif()
250-
251245
option(WITH_BLUESTORE "Bluestore OSD backend" ON)
252246
if(WITH_BLUESTORE)
253247
if(LINUX)

cmake/modules/Findzfs.cmake

Lines changed: 0 additions & 28 deletions
This file was deleted.

src/os/CMakeLists.txt

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,6 @@ if(HAVE_LIBXFS)
3737
fs/XFS.cc)
3838
endif()
3939

40-
if(HAVE_LIBZFS)
41-
add_library(os_zfs_objs OBJECT
42-
filestore/ZFSFileStoreBackend.cc
43-
fs/ZFS.cc)
44-
target_include_directories(os_zfs_objs SYSTEM PRIVATE
45-
${ZFS_INCLUDE_DIRS})
46-
list(APPEND libos_srcs $<TARGET_OBJECTS:os_zfs_objs>)
47-
endif()
48-
4940
add_library(os STATIC ${libos_srcs})
5041
target_link_libraries(os
5142
legacy-option-headers
@@ -66,10 +57,6 @@ if(WITH_FUSE)
6657
target_link_libraries(os FUSE::FUSE)
6758
endif()
6859

69-
if(HAVE_LIBZFS)
70-
target_link_libraries(os ${ZFS_LIBRARIES})
71-
endif()
72-
7360
if(WITH_LTTNG)
7461
add_dependencies(os objectstore-tp)
7562
add_dependencies(os bluestore-tp)

0 commit comments

Comments
 (0)