diff --git a/ports/spdlog/portfile.cmake b/ports/spdlog/portfile.cmake index e460dc0a738c2b..ca49c2537d53ae 100644 --- a/ports/spdlog/portfile.cmake +++ b/ports/spdlog/portfile.cmake @@ -50,7 +50,7 @@ vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/spdlog/tweakme.h "// #define SPDLOG_FMT_EXTERNAL" "#ifndef SPDLOG_FMT_EXTERNAL\n#define SPDLOG_FMT_EXTERNAL\n#endif" ) -if(SPDLOG_WCHAR_SUPPORT) +if(SPDLOG_WCHAR_SUPPORT AND VCPKG_TARGET_IS_WINDOWS) vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/spdlog/tweakme.h "// #define SPDLOG_WCHAR_TO_UTF8_SUPPORT" "#ifndef SPDLOG_WCHAR_TO_UTF8_SUPPORT\n#define SPDLOG_WCHAR_TO_UTF8_SUPPORT\n#endif" diff --git a/ports/spdlog/vcpkg.json b/ports/spdlog/vcpkg.json index 88c8341670efaa..4d517ce4b85d66 100644 --- a/ports/spdlog/vcpkg.json +++ b/ports/spdlog/vcpkg.json @@ -1,7 +1,7 @@ { "name": "spdlog", "version-semver": "1.10.0", - "port-version": 1, + "port-version": 2, "description": "Very fast, header only, C++ logging library", "homepage": "https://github.com/gabime/spdlog", "license": "MIT", @@ -24,7 +24,8 @@ ] }, "wchar": { - "description": "Build with wchar_t (Windows only)" + "description": "Build with wchar_t (Windows only)", + "supports": "windows" } } } diff --git a/versions/baseline.json b/versions/baseline.json index 9b237cd2f2154c..ea38803a598adf 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7062,7 +7062,7 @@ }, "spdlog": { "baseline": "1.10.0", - "port-version": 1 + "port-version": 2 }, "spectra": { "baseline": "1.0.1", diff --git a/versions/s-/spdlog.json b/versions/s-/spdlog.json index 4c363c1fb8f900..61c93d6945b236 100755 --- a/versions/s-/spdlog.json +++ b/versions/s-/spdlog.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f7ad0e9d934ce7401fb68968f5392fddc7dd4e3a", + "version-semver": "1.10.0", + "port-version": 2 + }, { "git-tree": "3256ea88cc375fda2f977a2eb18435e23d498572", "version-semver": "1.10.0",