diff --git a/coin/provisioning/qtci-macos-13-arm/32-install-vcpkg-ports.sh b/coin/provisioning/qtci-macos-13-arm/32-install-vcpkg-ports.sh index 8f9f44bf..818c70eb 100755 --- a/coin/provisioning/qtci-macos-13-arm/32-install-vcpkg-ports.sh +++ b/coin/provisioning/qtci-macos-13-arm/32-install-vcpkg-ports.sh @@ -4,7 +4,7 @@ set -ex BASEDIR=$(dirname "$0") "$BASEDIR/../common/unix/install-vcpkg-ports.sh" arm64-osx-qt --host-triplet=arm64-osx -"$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-osx-qt --host-triplet=x64-osx +"$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-osx-qt --host-triplet=arm64-osx python3 -m lipomerge $VCPKG_ROOT/installed/arm64-osx-qt $VCPKG_ROOT/installed/x64-osx-qt $VCPKG_ROOT/installed/universal-osx-qt find $VCPKG_ROOT/installed/universal-osx-qt -name '*.cmake' -exec sed -i .bak -E 's,/(arm64|x64)-osx(-qt)?/,/universal-osx-qt/,g' '{}' \; diff --git a/coin/provisioning/qtci-macos-13-x86_64/32-install-vcpkg-ports.sh b/coin/provisioning/qtci-macos-13-x86_64/32-install-vcpkg-ports.sh index 8f9f44bf..e7973ee4 100755 --- a/coin/provisioning/qtci-macos-13-x86_64/32-install-vcpkg-ports.sh +++ b/coin/provisioning/qtci-macos-13-x86_64/32-install-vcpkg-ports.sh @@ -3,7 +3,7 @@ set -ex BASEDIR=$(dirname "$0") -"$BASEDIR/../common/unix/install-vcpkg-ports.sh" arm64-osx-qt --host-triplet=arm64-osx +"$BASEDIR/../common/unix/install-vcpkg-ports.sh" arm64-osx-qt --host-triplet=x64-osx "$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-osx-qt --host-triplet=x64-osx python3 -m lipomerge $VCPKG_ROOT/installed/arm64-osx-qt $VCPKG_ROOT/installed/x64-osx-qt $VCPKG_ROOT/installed/universal-osx-qt diff --git a/coin/provisioning/qtci-macos-14-arm/32-install-vcpkg-ports.sh b/coin/provisioning/qtci-macos-14-arm/32-install-vcpkg-ports.sh index 8f9f44bf..818c70eb 100755 --- a/coin/provisioning/qtci-macos-14-arm/32-install-vcpkg-ports.sh +++ b/coin/provisioning/qtci-macos-14-arm/32-install-vcpkg-ports.sh @@ -4,7 +4,7 @@ set -ex BASEDIR=$(dirname "$0") "$BASEDIR/../common/unix/install-vcpkg-ports.sh" arm64-osx-qt --host-triplet=arm64-osx -"$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-osx-qt --host-triplet=x64-osx +"$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-osx-qt --host-triplet=arm64-osx python3 -m lipomerge $VCPKG_ROOT/installed/arm64-osx-qt $VCPKG_ROOT/installed/x64-osx-qt $VCPKG_ROOT/installed/universal-osx-qt find $VCPKG_ROOT/installed/universal-osx-qt -name '*.cmake' -exec sed -i .bak -E 's,/(arm64|x64)-osx(-qt)?/,/universal-osx-qt/,g' '{}' \; diff --git a/coin/provisioning/qtci-macos-14-x86_64/32-install-vcpkg-ports.sh b/coin/provisioning/qtci-macos-14-x86_64/32-install-vcpkg-ports.sh index 8f9f44bf..e7973ee4 100755 --- a/coin/provisioning/qtci-macos-14-x86_64/32-install-vcpkg-ports.sh +++ b/coin/provisioning/qtci-macos-14-x86_64/32-install-vcpkg-ports.sh @@ -3,7 +3,7 @@ set -ex BASEDIR=$(dirname "$0") -"$BASEDIR/../common/unix/install-vcpkg-ports.sh" arm64-osx-qt --host-triplet=arm64-osx +"$BASEDIR/../common/unix/install-vcpkg-ports.sh" arm64-osx-qt --host-triplet=x64-osx "$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-osx-qt --host-triplet=x64-osx python3 -m lipomerge $VCPKG_ROOT/installed/arm64-osx-qt $VCPKG_ROOT/installed/x64-osx-qt $VCPKG_ROOT/installed/universal-osx-qt diff --git a/coin/provisioning/qtci-macos-15-arm/32-install-vcpkg-ports.sh b/coin/provisioning/qtci-macos-15-arm/32-install-vcpkg-ports.sh index 8f9f44bf..818c70eb 100755 --- a/coin/provisioning/qtci-macos-15-arm/32-install-vcpkg-ports.sh +++ b/coin/provisioning/qtci-macos-15-arm/32-install-vcpkg-ports.sh @@ -4,7 +4,7 @@ set -ex BASEDIR=$(dirname "$0") "$BASEDIR/../common/unix/install-vcpkg-ports.sh" arm64-osx-qt --host-triplet=arm64-osx -"$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-osx-qt --host-triplet=x64-osx +"$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-osx-qt --host-triplet=arm64-osx python3 -m lipomerge $VCPKG_ROOT/installed/arm64-osx-qt $VCPKG_ROOT/installed/x64-osx-qt $VCPKG_ROOT/installed/universal-osx-qt find $VCPKG_ROOT/installed/universal-osx-qt -name '*.cmake' -exec sed -i .bak -E 's,/(arm64|x64)-osx(-qt)?/,/universal-osx-qt/,g' '{}' \; diff --git a/coin/provisioning/qtci-macos-15-x86_64/32-install-vcpkg-ports.sh b/coin/provisioning/qtci-macos-15-x86_64/32-install-vcpkg-ports.sh index 8f9f44bf..e7973ee4 100755 --- a/coin/provisioning/qtci-macos-15-x86_64/32-install-vcpkg-ports.sh +++ b/coin/provisioning/qtci-macos-15-x86_64/32-install-vcpkg-ports.sh @@ -3,7 +3,7 @@ set -ex BASEDIR=$(dirname "$0") -"$BASEDIR/../common/unix/install-vcpkg-ports.sh" arm64-osx-qt --host-triplet=arm64-osx +"$BASEDIR/../common/unix/install-vcpkg-ports.sh" arm64-osx-qt --host-triplet=x64-osx "$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-osx-qt --host-triplet=x64-osx python3 -m lipomerge $VCPKG_ROOT/installed/arm64-osx-qt $VCPKG_ROOT/installed/x64-osx-qt $VCPKG_ROOT/installed/universal-osx-qt