diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2021-04-28 03:44:31 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-27 12:44:31 -0700 |
| commit | b9cd2a7958dec657fb869ec487d2a98cf39a8d48 (patch) | |
| tree | 3804a6e910f54401f7f89018d978a9c40b4a0599 | |
| parent | 546813ae7b9e2873dd3d38e78b27ac5582feae10 (diff) | |
| download | vcpkg-b9cd2a7958dec657fb869ec487d2a98cf39a8d48.tar.gz vcpkg-b9cd2a7958dec657fb869ec487d2a98cf39a8d48.zip | |
[spdlog] Fix mingW build (#17511)
* [spdlog] Fix mingW build
* update version record
| -rw-r--r-- | ports/spdlog/fix-mingw-build.patch | 13 | ||||
| -rw-r--r-- | ports/spdlog/portfile.cmake | 1 | ||||
| -rw-r--r-- | ports/spdlog/vcpkg.json | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/s-/spdlog.json | 5 |
5 files changed, 21 insertions, 2 deletions
diff --git a/ports/spdlog/fix-mingw-build.patch b/ports/spdlog/fix-mingw-build.patch new file mode 100644 index 000000000..a82a9d10b --- /dev/null +++ b/ports/spdlog/fix-mingw-build.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b969465..31e23cd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -136,7 +136,7 @@ if(SPDLOG_BUILD_SHARED OR BUILD_SHARED_LIBS) + endif() + add_library(spdlog SHARED ${SPDLOG_SRCS} ${SPDLOG_ALL_HEADERS}) + target_compile_definitions(spdlog PUBLIC SPDLOG_SHARED_LIB) +- if(MSVC) ++ if(MSVC AND NOT MINGW) + target_compile_options(spdlog PUBLIC + $<$<AND:$<CXX_COMPILER_ID:MSVC>,$<NOT:$<COMPILE_LANGUAGE:CUDA>>>:/wd4251 /wd4275>) + endif() diff --git a/ports/spdlog/portfile.cmake b/ports/spdlog/portfile.cmake index f7606e512..1af8b142b 100644 --- a/ports/spdlog/portfile.cmake +++ b/ports/spdlog/portfile.cmake @@ -4,6 +4,7 @@ vcpkg_from_github( REF v1.8.5 SHA512 77cc9df0c40bbdbfe1f3e5818dccf121918bfceac28f2608f39e5bf944968b7e8e24a6fc29f01bc58a9bae41b8892d49cfb59c196935ec9868884320b50f130c HEAD_REF v1.x + PATCHES fix-mingw-build.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/spdlog/vcpkg.json b/ports/spdlog/vcpkg.json index 642bf554c..aa24c34b7 100644 --- a/ports/spdlog/vcpkg.json +++ b/ports/spdlog/vcpkg.json @@ -1,7 +1,7 @@ { "name": "spdlog", "version-semver": "1.8.5", - "port-version": 1, + "port-version": 2, "description": "Very fast, header only, C++ logging library", "homepage": "https://github.com/gabime/spdlog", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index b3ec11325..d25f9575a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5726,7 +5726,7 @@ }, "spdlog": { "baseline": "1.8.5", - "port-version": 1 + "port-version": 2 }, "spectra": { "baseline": "0.9.0", diff --git a/versions/s-/spdlog.json b/versions/s-/spdlog.json index 4a5726297..533df0dca 100644 --- a/versions/s-/spdlog.json +++ b/versions/s-/spdlog.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "9aa80a12ad92e29cfc19df70b9fd615b4aa5997b", + "version-semver": "1.8.5", + "port-version": 2 + }, + { "git-tree": "2e12349e1676bc1b9dce1f297789684a5ebd46c7", "version-semver": "1.8.5", "port-version": 1 |