Skip to content

[vcpkg baseline][qca] Re-fix find pkgconfig using FindPkgConfig.cmake #14110

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

Merged
BillyONeal merged 1 commit into from
Oct 19, 2020
Merged

[vcpkg baseline][qca] Re-fix find pkgconfig using FindPkgConfig.cmake #14110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 0 additions & 13 deletions ports/qca/0003-disable-plugin-botan.patch
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ports/qca/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Source: qca
Version: 2.3.1
Port-Version: 1
Port-Version: 2
Description: Qt Cryptographic Architecture (QCA).
Homepage: https://cgit.kde.org/qca.git/
Build-Depends: qt5-base[core]
19 changes: 18 additions & 1 deletion ports/qca/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,26 @@ vcpkg_from_github(
PATCHES
0001-fix-path-for-vcpkg.patch
0002-fix-build-error.patch
0003-disable-plugin-botan.patch
)

# Remove these files on the cmake next update
vcpkg_download_distfile(ARCHIVE_PKGCONFIG
URLS "https://gitlab.kitware.com/cmake/cmake/-/raw/ab8bd48352df060c4ead210fe30dc4736646206b/Modules/FindPkgConfig.cmake?inline=false"
FILENAME "FindPkgConfig.cmake"
SHA512 d9aada8107eac9ada197d0b1e9040cd3707de7f5838c90bca80321e8eb35931f520635800bea0e2aafeca7fafb08b8e4752d5c6c2d6b1a5d5b4e3225d7818aa6
)
vcpkg_download_distfile(ARCHIVE_PKGHSA
URLS "https://gitlab.kitware.com/cmake/cmake/-/raw/ab8bd48352df060c4ead210fe30dc4736646206b/Modules/FindPackageHandleStandardArgs.cmake?inline=false"
Copy link
Contributor Author

@JackBoosY JackBoosY Oct 19, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Required by FindPkgConfig.cmake.

FILENAME "FindPackageHandleStandardArgs.cmake"
SHA512 61a459a9e0797f976fae36ce4fd5a18a30bd13e8bc9d65d165ca760e13ddc27a8c8ad371ad4b41cc36fe227425424fe9bc6e4dfa5cfdc68bd59a3c10005cf3b4
)
vcpkg_download_distfile(ARCHIVE_PKGMSG
URLS "https://gitlab.kitware.com/cmake/cmake/-/raw/ab8bd48352df060c4ead210fe30dc4736646206b/Modules/FindPackageMessage.cmake?inline=false"
FILENAME "FindPackageMessage.cmake"
Copy link
Contributor Author

@JackBoosY JackBoosY Oct 19, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Required by FindPackageHandleStandardArgs.cmake.

SHA512 44af652038ecd98c1e54f440e67994759345290530b36f687b7e6d5c310caa55597f3718901fe7a3f8816b560f03b8f238d90aab6ce9b1b24391ab0bb2aa44a8
)
file(COPY ${ARCHIVE_PKGCONFIG} ${ARCHIVE_PKGHSA} ${ARCHIVE_PKGMSG} DESTINATION ${SOURCE_PATH}/cmake/modules)

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