diff --git a/ports/qca/portfile.cmake b/ports/qca/portfile.cmake index 4051346a81..9d8a91c269 100644 --- a/ports/qca/portfile.cmake +++ b/ports/qca/portfile.cmake @@ -45,10 +45,9 @@ vcpkg_execute_required_process( ) message(STATUS "Importing certstore done") +set(PLUGINS gnupg logger softstore wincrypto) if("botan" IN_LIST FEATURES) - list(APPEND QCA_OPTIONS -DWITH_botan_PLUGIN=yes) -else() - list(APPEND QCA_OPTIONS -DWITH_botan_PLUGIN=no) + list(APPEND PLUGINS botan) endif() # Configure and build @@ -56,13 +55,13 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DUSE_RELATIVE_PATHS=ON + "-DBUILD_PLUGINS=${PLUGINS}" -DBUILD_TESTS=OFF -DBUILD_TOOLS=OFF -DBUILD_WITH_QT6=ON -DQCA_SUFFIX=OFF -DQCA_FEATURE_INSTALL_DIR=share/qca/mkspecs/features -DOSX_FRAMEWORK=OFF - ${QCA_OPTIONS} OPTIONS_DEBUG -DQCA_PLUGINS_INSTALL_DIR=${QCA_FEATURE_INSTALL_DIR_DEBUG} OPTIONS_RELEASE diff --git a/ports/qca/vcpkg.json b/ports/qca/vcpkg.json index 883739b438..ed3534d2e5 100644 --- a/ports/qca/vcpkg.json +++ b/ports/qca/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qca", "version": "2.3.5", + "port-version": 1, "description": "Qt Cryptographic Architecture (QCA).", "homepage": "https://userbase.kde.org/QCA", "dependencies": [ @@ -28,7 +29,11 @@ "botan": { "description": "Build with botan", "dependencies": [ - "botan" + "botan", + { + "name": "pkgconf", + "host": true + } ] } } diff --git a/versions/baseline.json b/versions/baseline.json index 27f750c3ba..f82a086e25 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6362,7 +6362,7 @@ }, "qca": { "baseline": "2.3.5", - "port-version": 0 + "port-version": 1 }, "qcustomplot": { "baseline": "2.1.1", diff --git a/versions/q-/qca.json b/versions/q-/qca.json index 2184a5c299..9cb5b84be9 100644 --- a/versions/q-/qca.json +++ b/versions/q-/qca.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a5af940aef31f91feea8cb12daddb268a7cf4608", + "version": "2.3.5", + "port-version": 1 + }, { "git-tree": "8d7c38d61627baf7ae04a7f069fad8f506e5f82d", "version": "2.3.5",