From 5dddb82a39e9ec74f4db4dcad97bad49e33a6164 Mon Sep 17 00:00:00 2001
From: miyanyan <40262194+miyanyan@users.noreply.github.com>
Date: Tue, 19 Nov 2024 13:29:54 +0800
Subject: [PATCH] [spdlog] use '/utf-8' only when compiler is msvc (#42211)

---
 ports/spdlog/fix-msvc-utf8.patch | 15 +++++++++++++++
 ports/spdlog/portfile.cmake      |  2 ++
 ports/spdlog/vcpkg.json          |  1 +
 versions/baseline.json           |  2 +-
 versions/s-/spdlog.json          |  5 +++++
 5 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 ports/spdlog/fix-msvc-utf8.patch

diff --git a/ports/spdlog/fix-msvc-utf8.patch b/ports/spdlog/fix-msvc-utf8.patch
new file mode 100644
index 0000000000..15a34484ed
--- /dev/null
+++ b/ports/spdlog/fix-msvc-utf8.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c5bc7b8..2fcdfff 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -274,8 +274,8 @@ if(MSVC)
+     target_compile_options(spdlog PRIVATE "/Zc:__cplusplus")
+     target_compile_options(spdlog_header_only INTERFACE "/Zc:__cplusplus")
+     if(SPDLOG_MSVC_UTF8)
+-	    target_compile_options(spdlog PUBLIC "/utf-8")
+-	    target_compile_options(spdlog_header_only INTERFACE "/utf-8")    
++	    target_compile_options(spdlog PUBLIC $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CXX_COMPILER_ID:MSVC>>:/utf-8>)
++	    target_compile_options(spdlog_header_only INTERFACE $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CXX_COMPILER_ID:MSVC>>:/utf-8>)    
+      endif()
+ endif()
+ 
diff --git a/ports/spdlog/portfile.cmake b/ports/spdlog/portfile.cmake
index 6b64f91b20..47d542ebbe 100644
--- a/ports/spdlog/portfile.cmake
+++ b/ports/spdlog/portfile.cmake
@@ -4,6 +4,8 @@ vcpkg_from_github(
     REF "v${VERSION}"
     SHA512 3dd98409f4625ae4d46ef5f59a2fc22a6e151a13dba9d37433363e5d84eab7cca73b379eeb637d8f9b1f0f5a42221c0cc9a2a70414dc2b6af6a162e19fba0647
     HEAD_REF v1.x
+    PATCHES
+        fix-msvc-utf8.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
diff --git a/ports/spdlog/vcpkg.json b/ports/spdlog/vcpkg.json
index 15e73f7ac5..864d1217b5 100644
--- a/ports/spdlog/vcpkg.json
+++ b/ports/spdlog/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "spdlog",
   "version-semver": "1.15.0",
+  "port-version": 1,
   "description": "Very fast, header-only/compiled, C++ logging library.",
   "homepage": "https://github.com/gabime/spdlog",
   "license": "MIT",
diff --git a/versions/baseline.json b/versions/baseline.json
index 43f9b760cb..fab7a833de 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -8578,7 +8578,7 @@
     },
     "spdlog": {
       "baseline": "1.15.0",
-      "port-version": 0
+      "port-version": 1
     },
     "spectra": {
       "baseline": "1.0.1",
diff --git a/versions/s-/spdlog.json b/versions/s-/spdlog.json
index 2974be231c..fcd3ae287b 100644
--- a/versions/s-/spdlog.json
+++ b/versions/s-/spdlog.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "72b3738962d622e47073cf4a0dc0e6ddd29d1544",
+      "version-semver": "1.15.0",
+      "port-version": 1
+    },
     {
       "git-tree": "6595ef6c86cf6618cede07b4e1bc8b4d6b098b45",
       "version-semver": "1.15.0",