1 files changed, 28 insertions, 35 deletions
diff --git a/deps/fmt/CMakeLists.txt b/deps/fmt/CMakeLists.txt
index 70c328864c..464dfde771 100644
--- a/deps/fmt/CMakeLists.txt
+++ b/deps/fmt/CMakeLists.txt
@@ -9,63 +9,56 @@
 # This program is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+# User has manually chosen to ignore the git-tests, so throw them a warning.
+# This is done EACH compile so they can be alerted about the consequences.
+#
 
 include(CheckSymbolExists)
 
 set(strtod_l_headers stdlib.h)
 
+if (APPLE)
+  set(strtod_l_headers ${strtod_l_headers} xlocale.h)
+endif ()
+
 if(WIN32)
-  check_symbol_exists(open io.h HAVE_OPEN)
   check_symbol_exists(_strtod_l "${strtod_l_headers}" HAVE_STRTOD_L)
 else()
-  check_symbol_exists(open fcntl.h HAVE_OPEN)
   check_symbol_exists(strtod_l "${strtod_l_headers}" HAVE_STRTOD_L)
 endif()
 
-function(add_headers VAR)
-  set(headers ${${VAR}})
-  foreach (header ${ARGN})
-    set(headers ${headers} fmt/${header})
-  endforeach()
-  set(${VAR} ${headers} PARENT_SCOPE)
-endfunction()
-
-# Define the fmt library, its includes and the needed defines.
-add_headers(FMT_HEADERS 
-  chrono.h 
-  color.h 
-  compile.h 
-  core.h 
-  format.h 
-  format-inl.h
-  locale.h 
-  ostream.h 
-  printf.h 
-  ranges.h
-  safe-duration-cast.h)
+set(FMT_HEADERS
+  include/fmt/args.h
+  include/fmt/chrono.h
+  include/fmt/color.h
+  include/fmt/compile.h
+  include/fmt/core.h
+  include/fmt/format.h
+  include/fmt/format-inl.h
+  include/fmt/locale.h
+  include/fmt/os.h
+  include/fmt/ostream.h
+  include/fmt/printf.h
+  include/fmt/ranges.h)
 
-set(FMT_SOURCES fmt/format.cc)
+set(FMT_SOURCES
+  src/format.cc
+  src/os.cc)
 
-if(HAVE_OPEN)
-  add_headers(FMT_HEADERS posix.h)
-  set(FMT_SOURCES ${FMT_SOURCES} fmt/posix.cc)
-endif()
-
-add_library(fmt STATIC 
+add_library(fmt STATIC
   ${FMT_SOURCES}
   ${FMT_HEADERS})
 
-GroupSources(${CMAKE_CURRENT_SOURCE_DIR})
-
 if (HAVE_STRTOD_L)
-  target_compile_definitions(fmt 
-    PUBLIC 
+  target_compile_definitions(fmt
+    PUBLIC
       FMT_LOCALE)
 endif()
 
 target_include_directories(fmt
   PUBLIC
-    ${CMAKE_CURRENT_SOURCE_DIR})
+    ${CMAKE_CURRENT_SOURCE_DIR}/include)
 
 target_link_libraries(fmt
   PRIVATE