From 1f0e4438547ccd91a7e7e5291ff5bbdaebf68236 Mon Sep 17 00:00:00 2001 From: Willem Jan Withagen Date: Sun, 24 Mar 2019 14:28:40 +0100 Subject: [PATCH] cmake: use StdFilesystem::filesystem instead of stdc++fs Signed-off-by: Willem Jan Withagen --- CMakeLists.txt | 2 +- src/test/CMakeLists.txt | 1 - src/test/immutable_object_cache/CMakeLists.txt | 2 +- src/tools/immutable_object_cache/CMakeLists.txt | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8a8806a6b07..ea343e0e63f 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 51070a1331d..3d3aa8842ad 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 e890e63a2db..e4ed3d4599c 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 bc7e0c4bd4e..ed118ed6fba 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) -- 2.39.5