mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-19 05:53:03 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[spdlog] Fix build for Android (#16819)

Browse Source 
* Add Android logging library to spdlog

* Update version

* Update version

* Update ports/spdlog/portfile.cmake

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* Update version

Co-authored-by: Ahmed Yarub Hani Al Nuaimi <ahmed.alnuaimi@zwift.com>
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
This commit is contained in:
Ahmed Yarub Hani Al Nuaimi 2021-03-24 16:47:26 -03:00 committed by GitHub
parent 80bd78d3dd
commit 6562225c92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/spdlog/CONTROL
View File

@ -1,6 +1,6 @@
Source: spdlog
Version: 1.8.0
Port-Version: 2
Port-Version: 3
Homepage: https://github.com/gabime/spdlog
Description: Very fast, header only, C++ logging library
Build-Depends: fmt

15
ports/spdlog/fix-androidbuild.patch Normal file
View File

@ -0,0 +1,15 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt (revision 4a9ccf7e38e257feecce0c579a782741254eaeef)
+++ b/CMakeLists.txt (date 1616381634500)
@@ -188,6 +188,11 @@
set(PKG_CONFIG_REQUIRES fmt) # add dependency to pkg-config
endif ()
+if (ANDROID)
+ target_link_libraries(spdlog PUBLIC log)
+ target_link_libraries(spdlog_header_only INTERFACE log)
+endif ()
+
# ---------------------------------------------------------------------------------------
# Misc definitions according to tweak options
# ---------------------------------------------------------------------------------------

5
ports/spdlog/portfile.cmake
View File

@ -4,10 +4,13 @@ vcpkg_from_github(
REF 4a9ccf7e38e257feecce0c579a782741254eaeef # v1.8.0
SHA512 333f14704e0d0aa88abbe4ddd29aeb009de2f845440559d463f1b7f9c7da32b2fbdba0f2abf97ec2a5c479d2d62bb2220b21a1bc423d62fbbb93952cf829d532
HEAD_REF v1.x
PATCHES fix-featurebuild.patch
PATCHES
fix-featurebuild.patch
fix-androidbuild.patch
)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
benchmark SPDLOG_BUILD_BENCH
)

2
versions/baseline.json
View File

@ -5602,7 +5602,7 @@
},
"spdlog": {
"baseline": "1.8.0",
"port-version": 2
"port-version": 3
},
"spectra": {
"baseline": "0.9.0",

5
versions/s-/spdlog.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "aa6f400b5acd74dd5071a1419d4fce8ccaa3981c",
"version-string": "1.8.0",
"port-version": 3
},
{
"git-tree": "83277d69ee0f37839d9f06c9fb658a3dd457e3eb",
"version-string": "1.8.0",