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

[qca] Fix qca port not relocatable (#39602)

Browse Source
This commit is contained in:
Matthias Kuhn 2024-07-02 21:15:12 +03:00 committed by GitHub
parent 8b2599ca2a
commit 901407b872
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ports/qca/portfile.cmake
View File

@ -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()

2
ports/qca/vcpkg.json
View File

@ -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": [

2
versions/baseline.json
View File

@ -7134,7 +7134,7 @@
},
"qca": {
"baseline": "2.3.7",
"port-version": 1
"port-version": 2
},
"qcoro": {
"baseline": "0.10.0",

5
versions/q-/qca.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ed1a64051112c5fb71752955396dbe9a74a97cb7",
"version": "2.3.7",
"port-version": 2
},
{
"git-tree": "aaecacb5189f66099801d583df1cd73e97d74034",
"version": "2.3.7",