[qca] making softstore plugin a feature (microsoft#43182)

FrankXie05 · Feb 13, 2025 · 24ea75e · 24ea75e
1 parent 06b889a
commit 24ea75e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/ports/qca/portfile.cmake b/ports/qca/portfile.cmake
@@ -47,13 +47,18 @@ vcpkg_execute_required_process(
 )
 message(STATUS "Importing certstore done")
 
-set(PLUGINS gnupg logger softstore wincrypto)
+set(PLUGINS gnupg logger wincrypto)
 if("botan" IN_LIST FEATURES)
     list(APPEND PLUGINS botan)
 endif()
 if ("ossl" IN_LIST FEATURES)
     list(APPEND PLUGINS ossl)
 endif()
+if (VCPKG_TARGET_IS_OSX AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+    message(STATUS "Building with an osx-dynamic triplet: 'softstore' disabled.")
+else()
+    list(APPEND PLUGINS softstore)
+endif()
 
 # Configure and build
 vcpkg_cmake_configure(

diff --git a/ports/qca/vcpkg.json b/ports/qca/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "qca",
   "version": "2.3.7",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Qt Cryptographic Architecture (QCA).",
   "homepage": "https://userbase.kde.org/QCA",
   "dependencies": [

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -7374,7 +7374,7 @@
     },
     "qca": {
       "baseline": "2.3.7",
-      "port-version": 2
+      "port-version": 3
     },
     "qcoro": {
       "baseline": "0.11.0",

diff --git a/versions/q-/qca.json b/versions/q-/qca.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ea6eaf031e8b46b5ef65ea43cc0a72115d1962c1",
+      "version": "2.3.7",
+      "port-version": 3
+    },
     {
       "git-tree": "ed1a64051112c5fb71752955396dbe9a74a97cb7",
       "version": "2.3.7",