mirror of
https://github.com/chris2511/xca.git
synced 2026-09-12 19:51:05 +05:00
Macos: Build on Github with SDK-10.15 and Qt5
For official builds go to SDK 11, since Qt-6.6 only supports SDK 11 anyway. Switch to QT 6.6.2
This commit is contained in:
parent
e72ffb1445
commit
1725863325
6
.github/workflows/cmake.yaml
vendored
6
.github/workflows/cmake.yaml
vendored
@ -12,7 +12,7 @@ jobs:
|
||||
matrix:
|
||||
|
||||
os: [ ubuntu, macos, windows ]
|
||||
qt: [ "5.15.2", "6.6.0" ]
|
||||
qt: [ "5.15.2", "6.6.2" ]
|
||||
|
||||
include:
|
||||
- os: ubuntu
|
||||
@ -44,7 +44,7 @@ jobs:
|
||||
|
||||
exclude:
|
||||
- os: windows
|
||||
qt: "6.6.0"
|
||||
qt: "6.6.2"
|
||||
#winarch: win64_mingw
|
||||
#runs: windows-latest
|
||||
|
||||
@ -80,7 +80,7 @@ jobs:
|
||||
- name: Configure
|
||||
# No YAML Multiline mechanism (>, |, \, >-, >+2 whatever) works as expected
|
||||
# Give up. Live with the long line
|
||||
run: cmake -B ${{github.workspace}}/build -G "${{matrix.generator}}" -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DOPENSSL_ROOT_DIR=${{matrix.openssl_root}} --warn-uninitialized -DCMAKE_OSX_ARCHITECTURES=x86_64
|
||||
run: cmake -B ${{github.workspace}}/build -G "${{matrix.generator}}" -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DOPENSSL_ROOT_DIR=${{matrix.openssl_root}} --warn-uninitialized -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_OSX_DEPLOYMENT_TARGET="10.15"
|
||||
|
||||
- name: Build
|
||||
run: cmake --build ${{github.workspace}}/build -j 5 -v
|
||||
|
||||
@ -65,13 +65,13 @@ OSSL_MAJOR="3"
|
||||
OSSL="openssl-3.1.5"
|
||||
XCA_DIR="$(cd `dirname $0`/.. && pwd)"
|
||||
TOP_DIR="`dirname $XCA_DIR`"
|
||||
QT_DIR="$TOP_DIR/6.6.0/macos"
|
||||
QT_DIR="$TOP_DIR/6.6.2/macos"
|
||||
|
||||
BUILDDIR="$TOP_DIR/osx-release-dmg"
|
||||
BUILDDIR_APPSTORE="$TOP_DIR/osx-release-appstore"
|
||||
|
||||
INSTALL_DIR="$TOP_DIR/install"
|
||||
SDK="10.15"
|
||||
SDK="11.0"
|
||||
JOBS=7
|
||||
|
||||
cd $TOP_DIR
|
||||
|
||||
@ -16,7 +16,7 @@ do_openssl() {
|
||||
OSSL="openssl-3.1.5"
|
||||
XCA_DIR="$(cd `dirname $0`/.. && pwd)"
|
||||
TOP_DIR="`dirname $XCA_DIR`"
|
||||
QT_DIR="$TOP_DIR/QT/6.6.0/mingw_64"
|
||||
QT_DIR="$TOP_DIR/QT/6.6.2/mingw_64"
|
||||
BUILDDIR="$TOP_DIR/w64-release"
|
||||
INSTALL_DIR="/c/OpenSSL"
|
||||
JOBS=7
|
||||
|
||||
Loading…
Reference in New Issue
Block a user