From: Willem Jan Withagen <wjw@digiware.nl>
Date: Sun, 24 Mar 2019 13:28:40 +0000 (+0100)
Subject: cmake: use StdFilesystem::filesystem instead of stdc++fs
X-Git-Tag: v15.0.0~95^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F27149%2Fhead;p=ceph.git

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 8a8806a6b07a..ea343e0e63f6 100644
--- 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 51070a1331d3..3d3aa8842ad6 100644
--- 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 e890e63a2dbc..e4ed3d4599ca 100644
--- 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 bc7e0c4bd4e8..ed118ed6fbaf 100644
--- 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)