From: Kefu Chai <kchai@redhat.com>
Date: Mon, 7 Jun 2021 08:39:22 +0000 (+0800)
Subject: cmake: stop detecting <experimental/filesystem>
X-Git-Tag: v17.1.0~1694^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d2b0382ec6f67c4f6f2eb422c676db4ea561e490;p=ceph.git

cmake: stop detecting <experimental/filesystem>

since we've dropped the support of GCC older than v8.0, there is no need
to detect <experimental/filesystem>

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/cmake/modules/FindStdFilesystem.cmake b/cmake/modules/FindStdFilesystem.cmake
index c66f572459b6..421450c001ea 100644
--- a/cmake/modules/FindStdFilesystem.cmake
+++ b/cmake/modules/FindStdFilesystem.cmake
@@ -28,7 +28,6 @@ set(_std_filesystem_already_included FALSE)
 foreach(library
     ""
     "stdc++fs"
-    "c++experimental"
     "c++fs")
   try_std_filesystem_library("${library}" StdFilesystem_LIBRARY _std_filesystem_already_included)
   if(_std_filesystem_already_included)
diff --git a/cmake/modules/FindStdFilesystem_test.cc b/cmake/modules/FindStdFilesystem_test.cc
index 8b308fff432f..413ac31796e2 100644
--- a/cmake/modules/FindStdFilesystem_test.cc
+++ b/cmake/modules/FindStdFilesystem_test.cc
@@ -1,12 +1,6 @@
-#if __has_include(<filesystem>)
 #include <filesystem>
+
 namespace fs = std::filesystem;
-#elif __has_include(<experimental/filesystem>)
-#include <experimental/filesystem>
-namespace fs = std::experimental::filesystem;
-#else
-#error std::filesystem not available!
-#endif
 
 int main() {
     fs::create_directory("sandbox");