import 15.2.0 Octopus source

[ceph.git] / ceph / src / seastar / cmake / FindStdFilesystem.cmake

diff --git a/ceph/src/seastar/cmake/FindStdFilesystem.cmake b/ceph/src/seastar/cmake/FindStdFilesystem.cmake
index 2a5eccdd5e9c11689100f57c15e5c885b586ed8c..05e8add04ea92b7805a4e73ccc6551d5592ffe94 100644 (file)
--- a/ceph/src/seastar/cmake/FindStdFilesystem.cmake
+++ b/ceph/src/seastar/cmake/FindStdFilesystem.cmake
@@ -20,13 +20,25 @@
 # Copyright (C) 2018 Scylladb, Ltd.
 #
 
+#
+# Variables:
+#
+#   StdFilesystem_CXX_DIALECT
+#
+
 include (CheckCXXSourceCompiles)
 file (READ ${CMAKE_CURRENT_LIST_DIR}/code_tests/StdFilesystem_test.cc _stdfilesystem_test_code)
 
+if (StdFilesystem_CXX_DIALECT)
+  set (_stdfilesystem_cxx_dialect_args "-std=${StdFilesystem_CXX_DIALECT}")
+else ()
+  set (_stdfilesystem_cxx_dialect_args "")
+endif ()
+
 macro (_stdfilesystem_check_compiles var)
   set (libraries ${ARGN})
   set (CMAKE_REQUIRED_LIBRARIES ${libraries})
-  set (CMAKE_REQUIRED_FLAGS -std=gnu++14)
+  set (CMAKE_REQUIRED_FLAGS ${_stdfilesystem_cxx_dialect_args})
   check_cxx_source_compiles ("${_stdfilesystem_test_code}" ${var})
 endmacro ()
 
@@ -66,5 +78,5 @@ if (StdFilesystem_FOUND AND NOT (TARGET StdFilesystem::filesystem))
 
   set_target_properties (StdFilesystem::filesystem
     PROPERTIES
-      INTERFACE_LINK_LIBRARIES ${StdFilesystem_LIBRARIES})
+      INTERFACE_LINK_LIBRARIES "${StdFilesystem_LIBRARIES}")
 endif ()