cmake: use StdFilesystem::filesystem instead of stdc++fs

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8a8806a6b07ab47342e65049f4e11db64cad85b7..ea343e0e63f6c2ca0893c9d6134687ed02f29661 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -679,7 +679,7 @@ endif()
 include_directories(SYSTEM ${PROJECT_BINARY_DIR}/include)
 
 find_package(Threads REQUIRED)
-
+find_package(StdFilesystem)
 
 option(WITH_SELINUX "build SELinux policy" OFF)
 if(WITH_SELINUX)

diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 51070a1331d3cc625d1e052828aa5524cb806c16..3d3aa8842ad665c7f149a4a234e0fc2966d66ace 100644 (file)
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -469,7 +469,6 @@ endif(HAVE_BLKID OR FREEBSD)
 
 # ceph_test_admin_socket_output
 
-find_package(StdFilesystem)
 if(StdFilesystem_FOUND)
   add_executable(ceph_test_admin_socket_output
     test_admin_socket_output.cc

diff --git a/src/test/immutable_object_cache/CMakeLists.txt b/src/test/immutable_object_cache/CMakeLists.txt
index e890e63a2dbc91dab5188106569a943d3b41f07b..e4ed3d4599ca425943dc3de2a7e488006bb67fb3 100644 (file)
--- a/src/test/immutable_object_cache/CMakeLists.txt
+++ b/src/test/immutable_object_cache/CMakeLists.txt
@@ -16,7 +16,7 @@ target_link_libraries(unittest_ceph_immutable_obj_cache
   librados
   global
   radostest-cxx
-  stdc++fs
+  StdFilesystem::filesystem
   GTest::GTest
   )
 

diff --git a/src/tools/immutable_object_cache/CMakeLists.txt b/src/tools/immutable_object_cache/CMakeLists.txt
index bc7e0c4bd4e80d1e7cf07566649678212b2c6871..ed118ed6fbaf2c7e48c2d3c674652bf933045acd 100644 (file)
--- a/src/tools/immutable_object_cache/CMakeLists.txt
+++ b/src/tools/immutable_object_cache/CMakeLists.txt
@@ -14,6 +14,6 @@ add_executable(ceph-immutable-object-cache
 target_link_libraries(ceph-immutable-object-cache
   ceph_immutable_object_cache_lib
   librados
-  stdc++fs
+  StdFilesystem::filesystem
   global)
 install(TARGETS ceph-immutable-object-cache DESTINATION bin)