diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2020-03-09 09:19:05 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2020-03-09 09:19:05 -0700 |
| commit | 6b55c62144b120f3c5fc0d3cd8163f309241a18a (patch) | |
| tree | 125aa435dff79db545fc4b08ab0c3cb537bc725c /ports/spdlog | |
| parent | e21400c7cae2c2df3a9dce6ef8e3c4bf7109aaac (diff) | |
| parent | d0b1f2a9e8ed1ea53d181d13c69e15cf775148db (diff) | |
| download | vcpkg-6b55c62144b120f3c5fc0d3cd8163f309241a18a.tar.gz vcpkg-6b55c62144b120f3c5fc0d3cd8163f309241a18a.zip | |
Merge remote-tracking branch 'origin/master' into HEAD
Diffstat (limited to 'ports/spdlog')
| -rw-r--r-- | ports/spdlog/CONTROL | 4 | ||||
| -rw-r--r-- | ports/spdlog/fix-include.patch | 12 | ||||
| -rw-r--r-- | ports/spdlog/portfile.cmake | 1 |
3 files changed, 15 insertions, 2 deletions
diff --git a/ports/spdlog/CONTROL b/ports/spdlog/CONTROL index 4c27da425..e7f91fc94 100644 --- a/ports/spdlog/CONTROL +++ b/ports/spdlog/CONTROL @@ -1,9 +1,9 @@ Source: spdlog -Version: 1.4.2 +Version: 1.4.2-1 Homepage: https://github.com/gabime/spdlog Description: Very fast, header only, C++ logging library Build-Depends: fmt Feature: benchmark Description: Use google benchmark -Build-Depends: benchmark
\ No newline at end of file +Build-Depends: benchmark diff --git a/ports/spdlog/fix-include.patch b/ports/spdlog/fix-include.patch new file mode 100644 index 000000000..7f5539201 --- /dev/null +++ b/ports/spdlog/fix-include.patch @@ -0,0 +1,12 @@ +diff --git a/include/spdlog/common.h b/include/spdlog/common.h +index e1108a0a..b4faf26e 100644 +--- a/include/spdlog/common.h ++++ b/include/spdlog/common.h +@@ -14,6 +14,7 @@ + #include <string> + #include <type_traits> + #include <functional> ++#include <cassert> + + #ifdef _WIN32 + #ifndef NOMINMAX diff --git a/ports/spdlog/portfile.cmake b/ports/spdlog/portfile.cmake index 0bbad6d61..f62234090 100644 --- a/ports/spdlog/portfile.cmake +++ b/ports/spdlog/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( fix-feature-export.patch fix-error-4275.patch fix-uwp.patch + fix-include.patch ) set(SPDLOG_USE_BENCHMARK OFF) |