fixup filesystem check

KhronosGroup · May 22, 2020 · 5354781 · 5354781
1 parent e8b1f32
commit 5354781
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/cmake/StdFilesystemFlags.cmake b/src/cmake/StdFilesystemFlags.cmake
@@ -15,23 +15,24 @@ int main() {
 "
 )
 set(_stdfs_source
-    "#if __cplusplus >= 201703L
+    "#if (__cplusplus >= 201703L) || (defined(_MSC_VER) && _MSC_VER >= 1900 && defined(_HAS_CXX17) && _HAS_CXX17)
 #include <filesystem>
 namespace fs = std::filesystem;
 #endif
 ${_stdfs_test_source}
 "
 )
 set(_stdfs_experimental_source
-    "#if __cplusplus < 201703L
+"#if (__cplusplus >= 201703L) || (defined(_MSC_VER) && _MSC_VER >= 1900 && defined(_HAS_CXX17) && _HAS_CXX17)
+#else
 #include <experimental/filesystem>
 namespace fs = std::experimental::filesystem;
 #endif
 ${_stdfs_test_source}
 "
 )
 set(_stdfs_needlib_source
-    "#if __cplusplus >= 201703L
+    "#if (__cplusplus >= 201703L) || (defined(_MSC_VER) && _MSC_VER >= 1900 && defined(_HAS_CXX17) && _HAS_CXX17)
 #include <filesystem>
 namespace fs = std::filesystem;
 #else