aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>2021-02-09 06:01:00 +0800
committerGitHub <noreply@github.com>2021-02-08 14:01:00 -0800
commit8a95605a7b757d7a66f4f6e972780e2eaf62d67d (patch)
treeba7c0dfd3843849229ad83ed98f09fd088e70d97
parent66ffe4d7e194b168cfb7ba89c4237f10665b6535 (diff)
downloadvcpkg-8a95605a7b757d7a66f4f6e972780e2eaf62d67d.tar.gz
vcpkg-8a95605a7b757d7a66f4f6e972780e2eaf62d67d.zip
[spdlog] Support build shared library (#16089)
* [spdlog] Support build shared library * update version * update protifile * update version
-rw-r--r--ports/spdlog/CONTROL2
-rw-r--r--ports/spdlog/portfile.cmake3
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/s-/spdlog.json5
4 files changed, 10 insertions, 2 deletions
diff --git a/ports/spdlog/CONTROL b/ports/spdlog/CONTROL
index c924d2b38..5b0271b9e 100644
--- a/ports/spdlog/CONTROL
+++ b/ports/spdlog/CONTROL
@@ -1,6 +1,6 @@
Source: spdlog
Version: 1.8.0
-Port-Version: 1
+Port-Version: 2
Homepage: https://github.com/gabime/spdlog
Description: Very fast, header only, C++ logging library
Build-Depends: fmt
diff --git a/ports/spdlog/portfile.cmake b/ports/spdlog/portfile.cmake
index 78914448d..30a41fcea 100644
--- a/ports/spdlog/portfile.cmake
+++ b/ports/spdlog/portfile.cmake
@@ -11,6 +11,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
benchmark SPDLOG_BUILD_BENCH
)
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SPDLOG_BUILD_SHARED)
+
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
@@ -18,6 +20,7 @@ vcpkg_configure_cmake(
${FEATURE_OPTIONS}
-DSPDLOG_FMT_EXTERNAL=ON
-DSPDLOG_INSTALL=ON
+ -DSPDLOG_BUILD_SHARED=${SPDLOG_BUILD_SHARED}
)
vcpkg_install_cmake()
diff --git a/versions/baseline.json b/versions/baseline.json
index adb49aef3..c303ef502 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5510,7 +5510,7 @@
},
"spdlog": {
"baseline": "1.8.0",
- "port-version": 1
+ "port-version": 2
},
"spectra": {
"baseline": "0.9.0",
diff --git a/versions/s-/spdlog.json b/versions/s-/spdlog.json
index 218719832..88e709b0b 100644
--- a/versions/s-/spdlog.json
+++ b/versions/s-/spdlog.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "83277d69ee0f37839d9f06c9fb658a3dd457e3eb",
+ "version-string": "1.8.0",
+ "port-version": 2
+ },
+ {
"git-tree": "51a19e55194fc03004bf1584612eb50cce1b4ec2",
"version-string": "1.8.0",
"port-version": 1