implement workaround windows from fmtlib/fmt#2691

this also reverts commit c5a7f4c and thus results in consistent crt behavior on windows
akohlmey · Jan 3, 2022 · 49412ce · 49412ce
1 parent c5a7f4c
commit 49412ce
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -629,7 +629,7 @@ endif()
 # and after everything else that is compiled locally
 ######################################################################
 if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-  target_link_libraries(lammps PRIVATE "wsock32;psapi;ucrt")
+  target_link_libraries(lammps PRIVATE "wsock32;psapi")
 endif()
 
 ######################################################

diff --git a/src/fmt/chrono.h b/src/fmt/chrono.h
@@ -1082,7 +1082,7 @@ template <typename OutputIt, typename Char> class tm_writer {
   }
   template <typename T, FMT_ENABLE_IF(!has_member_data_tm_gmtoff<T>::value)>
   void format_utc_offset_impl(const T& tm) {
-#if defined(_WIN32)
+#if defined(_WIN32) && defined(_UCRT)
 #  if FMT_USE_TZSET
     tzset_once();
 #  endif