Merge pull request ceph#52688 from petrutlucian94/avoid_tzset

idryomov · web-flow · commit e45272df047a · 2023-07-29T00:23:42.000+02:00
build: globally set FMT_USE_TZSET=0 for Windows

Reviewed-by: Ilya Dryomov &lt;idryomov@gmail.com&gt;
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -46,6 +46,7 @@ if(WIN32)
   # https://github.com/msys2/MINGW-packages/issues/3319
   add_definitions(
     -D_WIN32_WINNT=${WIN32_WINNT}
+    -DFMT_USE_TZSET=0
     -DBOOST_THREAD_PROVIDES_GENERIC_SHARED_MUTEX_ON_WIN
     -DBOOST_THREAD_V2_SHARED_MUTEX
   )
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -337,8 +337,6 @@ else()
   add_subdirectory(fmt)
   set(BUILD_SHARED_LIBS ${old_BUILD_SHARED_LIBS})
   unset(old_BUILD_SHARED_LIBS)
-  target_compile_definitions(fmt PUBLIC
-    $<$<BOOL:${WIN32}>:FMT_USE_TZSET=0>)
   include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/src/fmt/include")
 endif()
 

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@ if(WIN32)`
`46`	`46`	`# https://github.com/msys2/MINGW-packages/issues/3319`
`47`	`47`	`add_definitions(`
`48`	`48`	`-D_WIN32_WINNT=${WIN32_WINNT}`
	`49`	`+ -DFMT_USE_TZSET=0`
`49`	`50`	`-DBOOST_THREAD_PROVIDES_GENERIC_SHARED_MUTEX_ON_WIN`
`50`	`51`	`-DBOOST_THREAD_V2_SHARED_MUTEX`
`51`	`52`	`)`