Merge branch 'develop' into feature/MAGP-1137-add-webp

ecmwf · Dec 19, 2023 · e140097 · e140097
2 parents e369bca + 3fa5658
commit e140097
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/web/MagConfig.cc b/src/web/MagConfig.cc
@@ -18,7 +18,15 @@
 #include "Value.h"
 
 
-#if ((defined(_MSVC_LANG) && _MSVC_LANG >= 201703L) || __cplusplus >= 201703L)
+#define STD_FILESYSTEM_INCLUDE_MISSING 0
+#ifdef __has_include
+    #if !__has_include(<filesystem>)
+        #define STD_FILESYSTEM_INCLUDE_MISSING 1
+    #endif
+#endif
+
+
+#if ((defined(_MSVC_LANG) && _MSVC_LANG >= 201703L) || (__cplusplus >= 201703L) && !STD_FILESYSTEM_INCLUDE_MISSING)
 #include <filesystem>
 namespace fs = std::filesystem;
 #else
@@ -579,4 +587,4 @@ bool PaletteLibrary::find(string& name, Palette& out) {
     }
     return false;
 
-}
+}