fix

steinwurf · Nov 5, 2024 · dd11025 · dd11025
1 parent 6e2f2c2
commit dd11025
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -29,7 +29,10 @@ target_compile_definitions(fmt INTERFACE FMT_HEADER_ONLY)
 target_compile_definitions(fmt INTERFACE FMT_USE_CONSTEXPR=0)
 
 target_include_directories(fmt
-                           INTERFACE "${STEINWURF_RESOLVE}/fmt-source/include")
+  INTERFACE "${STEINWURF_RESOLVE}/fmt-source/include")
+
+# Unicode support requires compiling with /utf-8 on MSVC
+target_compile_options(fmt INTERFACE $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CXX_COMPILER_ID:MSVC>>:/utf-8>)
 
 add_library(steinwurf::fmt ALIAS fmt)
 

diff --git a/wscript b/wscript
@@ -17,8 +17,15 @@ def build(bld):
     # Create system include for fmt
     fmt_include = fmt_path.find_dir("include")
 
+
+    cxxflags = []
+    if "cl.exe" in bld.env.get_flat("CXX").lower():
+        # Unicode support requires compiling with /utf-8.
+        cxxflags += ["/utf-8"]
+
     bld(
         name="fmt",
+        cxxflags=cxxflags,
         export_includes=fmt_include.abspath(),
         export_defines=[
             "FMT_HEADER_ONLY",