[Bf-blender-cvs] [c675dd05adf] temp-asset-browser-catalogs: Remove remaining C++ filesystem file & CMakeLists entries

[Julian Eisel]

Commit: c675dd05adf426759a66fcdfc9c3adb547886beb
Author: Julian Eisel
Date:   Tue Sep 21 16:10:09 2021 +0200
Branches: temp-asset-browser-catalogs
https://developer.blender.org/rBc675dd05adf426759a66fcdfc9c3adb547886beb

Remove remaining C++ filesystem file & CMakeLists entries

===================================================================

M	source/blender/blenkernel/CMakeLists.txt
D	source/blender/blenlib/BLI_filesystem.hh
M	source/blender/blenlib/CMakeLists.txt

===================================================================

diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 65f7197742d..14f955a80e8 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -53,7 +53,6 @@ set(INC
   ../../../intern/mikktspace
   ../../../intern/opensubdiv
   ../../../extern/curve_fit_nd
-  ../../../extern/ghc_filesystem
 
   # dna_type_offsets.h
   ${CMAKE_CURRENT_BINARY_DIR}/../makesdna/intern
diff --git a/source/blender/blenlib/BLI_filesystem.hh b/source/blender/blenlib/BLI_filesystem.hh
deleted file mode 100644
index 9d56d6459b0..00000000000
--- a/source/blender/blenlib/BLI_filesystem.hh
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-/** \file
- * \ingroup bli
- *
- * Header for a platform compatible replacement of C++17's `std::filesystem`. Access via
- * `blender::filesystem`.
- *
- * The need for this comes from macOS only supporting `std::filesystem` with XCode 11, only
- * available on macOS 10.15.
- */
-
-#pragma once
-
-/* ghc::filesystem includes Windows.h, which by default pollutes the global namespace and impacts
- * compile time quite a bit. Set some defines to avoid this. */
-#ifdef WIN32
-#  ifndef NOGDI
-#    define NOGDI
-#    define NOGDI_CLEANUP
-#  endif
-#  ifndef NOMINMAX
-#    define NOMINMAX
-#    define NOMINMAX_CLEANUP
-#  endif
-#  ifndef WIN32_LEAN_AND_MEAN
-#    define WIN32_LEAN_AND_MEAN
-#    define WIN32_LEAN_AND_MEAN_CLEANUP
-#  endif
-#  ifndef NOCOMM
-#    define NOCOMM
-#    define NOCOMM_CLEANUP
-#  endif
-#endif /* _WIN32 */
-
-/* Header for ghc::filesystem. */
-#include "filesystem.hpp"
-
-#ifdef WIN32
-#  ifdef NOGDI_CLEANUP
-#    undef NOGDI
-#    undef NOGDI_CLEANUP
-#  endif
-#  ifdef NOMINMAX_CLEANUP
-#    undef NOMINMAX
-#    undef NOMINMAX_CLEANUP
-#  endif
-#  ifdef WIN32_LEAN_AND_MEAN_CLEANUP
-#    undef WIN32_LEAN_AND_MEAN
-#    undef WIN32_LEAN_AND_MEAN_CLEANUP
-#  endif
-#  ifdef NOCOMM_CLEANUP
-#    undef NOCOMM
-#    undef NOCOMM_CLEANUP
-#  endif
-#endif
-
-namespace blender {
-namespace filesystem = ghc::filesystem;
-}
diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt
index 1337a31118a..1eaf007e01b 100644
--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@@ -26,7 +26,6 @@ set(INC
   ../../../intern/eigen
   ../../../intern/guardedalloc
   ../../../intern/numaapi/include
-  ../../../extern/ghc_filesystem
   ../../../extern/wcwidth
 )