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.

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

Add vcpkg manifest with build dependencies #10088

Merged
merged 1 commit into from
Mar 8, 2024

Conversation

phoerious
Copy link
Member

@phoerious phoerious commented Dec 9, 2023

Adds a vcpkg manifest, so all dependencies can now be installed automatically by running

mkdir build && cd build
cmake \
    -DWITH_XC_ALL=ON \
    -DCMAKE_TOOLCHAIN_FILE=${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake \
    [ -DVCPKG_TARGET_TRIPLET=triplet-name ] \
    ..

I also bumped the minimum CMake version to 3.10, which is what Ubuntu Bionic has. This gets rid of a deprecation warning and I have no idea whether our CMake files are still compatible with 3.3 anyway.

I further added vcpkg overlay triplets that skip building all packages also in debug mode (and build dynamic instead of static libs on macOS).

Testing strategy

Works on macOS. Please test on Windows @droidmonkey. I also added all the Linux packages that are available on vcpkg, but I suppose we cannot fully replace installing *-dev packages globally yet.

Type of change

  • ✅ New feature (change that adds functionality)

@phoerious phoerious requested a review from a team December 9, 2023 13:47
@phoerious phoerious added this to the v2.8.0 milestone Dec 9, 2023
@phoerious phoerious force-pushed the feature/vcpkg-manifest-build branch 3 times, most recently from e2b74eb to 71043a5 Compare December 9, 2023 14:14
Copy link

codecov bot commented Dec 9, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 64.72%. Comparing base (d2a4ccb) to head (2a1313c).

❗ Current head 2a1313c differs from pull request most recent head 305ad6d. Consider uploading reports for the commit 305ad6d to get more accurate results

Additional details and impacted files
@@             Coverage Diff             @@
##           develop   #10088      +/-   ##
===========================================
+ Coverage    64.67%   64.72%   +0.05%     
===========================================
  Files          339      335       -4     
  Lines        41493    41133     -360     
===========================================
- Hits         26832    26620     -212     
+ Misses       14661    14513     -148     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@phoerious phoerious force-pushed the feature/vcpkg-manifest-build branch from 44552cd to 031f7c7 Compare December 9, 2023 15:03
vcpkg.json Show resolved Hide resolved
@phoerious phoerious force-pushed the feature/vcpkg-manifest-build branch from 637738b to af0e779 Compare December 13, 2023 09:38
@droidmonkey droidmonkey force-pushed the feature/vcpkg-manifest-build branch from af0e779 to 726aa87 Compare January 14, 2024 05:41
@droidmonkey droidmonkey force-pushed the feature/vcpkg-manifest-build branch 2 times, most recently from 9b5eb53 to 2a1313c Compare January 27, 2024 13:48
@phoerious phoerious force-pushed the feature/vcpkg-manifest-build branch 3 times, most recently from 956e3d0 to 19752a6 Compare February 22, 2024 23:21
Also bump minimum CMake release
@phoerious phoerious force-pushed the feature/vcpkg-manifest-build branch from 19752a6 to 305ad6d Compare March 7, 2024 20:53
@droidmonkey droidmonkey merged commit d2e7d4a into develop Mar 8, 2024
11 checks passed
@droidmonkey droidmonkey deleted the feature/vcpkg-manifest-build branch March 8, 2024 00:03
@droidmonkey droidmonkey added the pr: backported Pull request backported to previous release label Mar 8, 2024
libf-de pushed a commit to libf-de/keepassxc-secretservice-dbus that referenced this pull request Mar 11, 2024
Release 2.7.7

- Support USB Hotplug for Hardware Key interface [keepassxreboot#10092]
- Support 1PUX and Bitwarden import [keepassxreboot#9815]
- Browser: Add support for PassKeys [keepassxreboot#8825, keepassxreboot#9987, keepassxreboot#10318]
- Build System: Move to vcpkg manifest mode [keepassxreboot#10088]

- Fix multiple TOTP issues [keepassxreboot#9874]
- Fix focus loss on save when the editor is not visible anymore [keepassxreboot#10075]
- Fix visual when removing entry from history [keepassxreboot#9947]
- Fix first entry is not selected when a search is performed [keepassxreboot#9868]
- Prevent scrollbars on entry drag/drop [keepassxreboot#9747]
- Prevent duplicate characters in "Also choose from" field of password generator  [keepassxreboot#9803]
- Security: Prevent byte-by-byte and attachment inference side channel attacks [keepassxreboot#10266]
- Browser: Fix raising Update Entry messagebox [keepassxreboot#9853]
- Browser: Fix bugs when returning credentials [keepassxreboot#9136]
- Browser: Fix crash on database open from browser [keepassxreboot#9939]
- Browser: Fix support for referenced URL fields [keepassxreboot#8788]
- MacOS: Fix crash when changing highlight/accent color [keepassxreboot#10348]
- MacOS: Fix TouchID appearing even though lid is closed [keepassxreboot#10092]
- Windows: Fix terminating KeePassXC processes with MSI installer [keepassxreboot#9822]
- FdoSecrets: Fix database merge crash when enabled [keepassxreboot#10136]

# -----BEGIN PGP SIGNATURE-----
#
# iQEzBAABCAAdFiEENIkEDB8MPuq41ValRA/GXy4MbgEFAmXs7VsACgkQRA/GXy4M
# bgHLpwf/brnyPPs3gJxZmD2pn8542D4CCsDh0fTceurOtqCe3J4Y+Fftc5euuoQu
# 6rP4vJdd586l7JX5FnYIPXvGiU9op3MudJh+y+RN/PWwKcXNIXfUItMhpZEka49n
# xnw+Wvbilg1QIHSSmZdIjBpohnEkA67qhWauc3bCacrRyEvIOzVMTxnqDTe4GUDy
# CyauaRMMKezRTpLxSsk63TDAZZgDwK4ci5lC6ysHekc1Za6IbI3fMFjz1BGj+kPU
# tMHMfDCWqK/5JZ27ZWcxy7m8tJY9m3rb+MoCyFRQz9ixaEe29yf5NqYdm9sn1Dlh
# O7aFi7/EJtsBlXdguw5BcTPbsL7XEQ==
# =Cots
# -----END PGP SIGNATURE-----
# gpg: directory '/home/runner/.gnupg' created
# gpg: keybox '/home/runner/.gnupg/pubring.kbx' created
# gpg: Signature made Sat Mar  9 23:14:35 2024 UTC
# gpg:                using RSA key 3489040C1F0C3EEAB8D556A5440FC65F2E0C6E01
# gpg: Can't check signature: No public key
@c4rlo c4rlo mentioned this pull request Jun 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build system pr: backported Pull request backported to previous release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants