mirror of
git://code.qt.io/qt/qt5.git
synced 2026-05-05 02:39:23 +08:00
Unify the vcpkg manifest location
There is not particular reason to hold multiple manifests for the vcpkg
for different platforms, since we expect that the direct dependency set
that is used from vcpkg will remain the same on each platform.
Keeping copies of the vcpkg manifest doesn't make much sense.
The vcpkg manifest and configuration file are now in the
coin/provisioning/common/shared/vcpkg directory.
Change-Id: Icc9c88592c68cb591216f3d0668f9984592d6c7b
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit da911f9b20)
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
committed by
Alexandru Croitor
parent
8a1ee9fe11
commit
9705c9c01a
@@ -4,9 +4,7 @@
|
||||
|
||||
echo "Installing vcpkg android ports"
|
||||
|
||||
pushd "${BASH_SOURCE%/*}/vcpkg" || exit
|
||||
cp "${BASH_SOURCE%/*}/../shared/vcpkg-configuration.json" .
|
||||
|
||||
pushd "${BASH_SOURCE%/*}/../shared/vcpkg" || exit
|
||||
"$VCPKG_ROOT/vcpkg" install --triplet x86-android-qt --x-install-root x86-android-qt-tmp --debug
|
||||
"$VCPKG_ROOT/vcpkg" install --triplet x86_64-android-qt --x-install-root x86_64-android-qt-tmp --debug
|
||||
|
||||
|
||||
@@ -7,8 +7,7 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
|
||||
|
||||
echo "Installing vcpkg ports"
|
||||
|
||||
pushd "${BASH_SOURCE%/*}/vcpkg" || exit
|
||||
cp "${BASH_SOURCE%/*}/../shared/vcpkg-configuration.json" .
|
||||
pushd "${BASH_SOURCE%/*}/../shared/vcpkg" || exit
|
||||
|
||||
install_root=x64-linux-qt-tmp
|
||||
|
||||
|
||||
@@ -1,14 +0,0 @@
|
||||
{
|
||||
"overrides": [
|
||||
{
|
||||
"name": "openssl",
|
||||
"version": "3.0.7",
|
||||
"port-version": 2
|
||||
}
|
||||
],
|
||||
"dependencies": [
|
||||
"openssl",
|
||||
"protobuf",
|
||||
"grpc"
|
||||
]
|
||||
}
|
||||
Reference in New Issue
Block a user