Skip to content

Commit

Permalink
Macos: Build on Github with SDK-10.15 and Qt5
Browse files Browse the repository at this point in the history
For official builds go to SDK 11, since Qt-6.6
only supports SDK 11 anyway.
  • Loading branch information
chris2511 committed Mar 10, 2024
1 parent e72ffb1 commit 69a6dff
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cmake.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions release/build-mac.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 69a6dff

Please sign in to comment.