diff options
| -rw-r--r-- | toolsrc/include/vcpkg/base/files.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/toolsrc/include/vcpkg/base/files.h b/toolsrc/include/vcpkg/base/files.h index b07ff25b3..b24778308 100644 --- a/toolsrc/include/vcpkg/base/files.h +++ b/toolsrc/include/vcpkg/base/files.h @@ -2,7 +2,7 @@ #include <vcpkg/base/expected.h> -#if defined(_WIN32) +#if defined(_WIN32) || defined(__cpp_lib_filesystem) #include <filesystem> #else #include <experimental/filesystem> @@ -10,7 +10,12 @@ namespace fs { +// VS2015 (_MSC_VER 1900) uses std::experimental::filesystem +#if (defined(_MSC_VER) && _MSC_VER > 1900) || defined(__cpp_lib_filesystem) + namespace stdfs = std::filesystem; +#else namespace stdfs = std::experimental::filesystem; +#endif using stdfs::copy_options; using stdfs::file_status; |