зеркало из https://github.com/microsoft/vcpkg.git
[vcpkg baseline][qca] Fix pkgconfig dependency properly (#30702)
* [qca] Fix pkgconfig dependency properly * Update qca.json --------- Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com>
This commit is contained in:
Родитель
f3472162aa
Коммит
f66871330f
|
@ -19,6 +19,8 @@ vcpkg_from_github(
|
|||
0003-Define-NOMINMAX-for-botan-plugin-with-MSVC.patch
|
||||
)
|
||||
|
||||
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)
|
||||
|
@ -62,6 +64,7 @@ vcpkg_cmake_configure(
|
|||
-DQCA_SUFFIX=OFF
|
||||
-DQCA_FEATURE_INSTALL_DIR=share/qca/mkspecs/features
|
||||
-DOSX_FRAMEWORK=OFF
|
||||
"-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}"
|
||||
OPTIONS_DEBUG
|
||||
-DQCA_PLUGINS_INSTALL_DIR=${QCA_FEATURE_INSTALL_DIR_DEBUG}
|
||||
OPTIONS_RELEASE
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "qca",
|
||||
"version": "2.3.5",
|
||||
"port-version": 1,
|
||||
"port-version": 2,
|
||||
"description": "Qt Cryptographic Architecture (QCA).",
|
||||
"homepage": "https://userbase.kde.org/QCA",
|
||||
"dependencies": [
|
||||
|
@ -29,11 +29,7 @@
|
|||
"botan": {
|
||||
"description": "Build with botan",
|
||||
"dependencies": [
|
||||
"botan",
|
||||
{
|
||||
"name": "pkgconf",
|
||||
"host": true
|
||||
}
|
||||
"botan"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
|
@ -6366,7 +6366,7 @@
|
|||
},
|
||||
"qca": {
|
||||
"baseline": "2.3.5",
|
||||
"port-version": 1
|
||||
"port-version": 2
|
||||
},
|
||||
"qcustomplot": {
|
||||
"baseline": "2.1.1",
|
||||
|
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "32321bfdc0e4563ed40687585b48038d551f6149",
|
||||
"version": "2.3.5",
|
||||
"port-version": 2
|
||||
},
|
||||
{
|
||||
"git-tree": "a5af940aef31f91feea8cb12daddb268a7cf4608",
|
||||
"version": "2.3.5",
|
||||
|
|
Загрузка…
Ссылка в новой задаче