Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[vcpkg baseline][qca] Fix pkgconfig dependency properly #30702

Merged
merged 2 commits into from
Apr 10, 2023
Merged

[vcpkg baseline][qca] Fix pkgconfig dependency properly #30702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a6ba84
[qca] Fix pkgconfig dependency properly
dg0yt Apr 6, 2023
6915fec
Update qca.json
Cheney-W Apr 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ports/qca/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
8 changes: 2 additions & 6 deletions ports/qca/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down Expand Up @@ -29,11 +29,7 @@
"botan": {
"description": "Build with botan",
"dependencies": [
"botan",
{
"name": "pkgconf",
"host": true
}
"botan"
]
}
}
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6362,7 +6362,7 @@
},
"qca": {
"baseline": "2.3.5",
"port-version": 1
"port-version": 2
},
"qcustomplot": {
"baseline": "2.1.1",
Expand Down
5 changes: 5 additions & 0 deletions versions/q-/qca.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "32321bfdc0e4563ed40687585b48038d551f6149",
"version": "2.3.5",
"port-version": 2
},
{
"git-tree": "a5af940aef31f91feea8cb12daddb268a7cf4608",
"version": "2.3.5",
Expand Down