diff --git a/ports/qca/portfile.cmake b/ports/qca/portfile.cmake index 64cf9d6d89..1d7e0dd4f8 100644 --- a/ports/qca/portfile.cmake +++ b/ports/qca/portfile.cmake @@ -22,11 +22,11 @@ vcpkg_from_github( vcpkg_find_acquire_program(PKGCONFIG) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - set(QCA_FEATURE_INSTALL_DIR_DEBUG ${CURRENT_PACKAGES_DIR}/debug/bin/Qca) - set(QCA_FEATURE_INSTALL_DIR_RELEASE ${CURRENT_PACKAGES_DIR}/bin/Qca) + set(QCA_PLUGIN_INSTALL_DIR_DEBUG ${CURRENT_PACKAGES_DIR}/debug/bin/Qca) + set(QCA_PLUGIN_INSTALL_DIR_RELEASE ${CURRENT_PACKAGES_DIR}/bin/Qca) else() - set(QCA_FEATURE_INSTALL_DIR_DEBUG ${CURRENT_PACKAGES_DIR}/debug/lib/Qca) - set(QCA_FEATURE_INSTALL_DIR_RELEASE ${CURRENT_PACKAGES_DIR}/lib/Qca) + set(QCA_PLUGIN_INSTALL_DIR_DEBUG ${CURRENT_PACKAGES_DIR}/debug/lib/Qca) + set(QCA_PLUGIN_INSTALL_DIR_RELEASE ${CURRENT_PACKAGES_DIR}/lib/Qca) endif() # According to: @@ -65,13 +65,13 @@ vcpkg_cmake_configure( -DBUILD_TOOLS=OFF -DBUILD_WITH_QT6=ON -DQCA_SUFFIX=OFF - -DQCA_FEATURE_INSTALL_DIR=share/qca/mkspecs/features + -DQCA_FEATURE_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/share/qca/mkspecs/features -DOSX_FRAMEWORK=OFF "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" OPTIONS_DEBUG - -DQCA_PLUGINS_INSTALL_DIR=${QCA_FEATURE_INSTALL_DIR_DEBUG} + -DQCA_PLUGINS_INSTALL_DIR=${QCA_PLUGIN_INSTALL_DIR_DEBUG} OPTIONS_RELEASE - -DQCA_PLUGINS_INSTALL_DIR=${QCA_FEATURE_INSTALL_DIR_RELEASE} + -DQCA_PLUGINS_INSTALL_DIR=${QCA_PLUGIN_INSTALL_DIR_RELEASE} ) vcpkg_cmake_install() diff --git a/ports/qca/vcpkg.json b/ports/qca/vcpkg.json index 13cc00b69d..2348652038 100644 --- a/ports/qca/vcpkg.json +++ b/ports/qca/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qca", "version": "2.3.7", - "port-version": 1, + "port-version": 2, "description": "Qt Cryptographic Architecture (QCA).", "homepage": "https://userbase.kde.org/QCA", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index a2031aeacb..508c4d55c9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7134,7 +7134,7 @@ }, "qca": { "baseline": "2.3.7", - "port-version": 1 + "port-version": 2 }, "qcoro": { "baseline": "0.10.0", diff --git a/versions/q-/qca.json b/versions/q-/qca.json index 5e00cb4f1e..14b457a0b8 100644 --- a/versions/q-/qca.json +++ b/versions/q-/qca.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ed1a64051112c5fb71752955396dbe9a74a97cb7", + "version": "2.3.7", + "port-version": 2 + }, { "git-tree": "aaecacb5189f66099801d583df1cd73e97d74034", "version": "2.3.7",