mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2025-03-01 10:33:28 +00:00
use ninja generator under macos
This commit is contained in:
committed by
LordGrey
parent
dc564e9a72
commit
dad1d8b4b4
5
.github/scripts/build.sh
vendored
5
.github/scripts/build.sh
vendored
@@ -17,9 +17,8 @@ echo "Compile Hyperion on '${RUNNER_OS}' with build type '${BUILD_TYPE}' and pla
|
||||
# Build the package on MacOS, Windows or Linux
|
||||
if [[ "$RUNNER_OS" == 'macOS' ]]; then
|
||||
mkdir build || exit 1
|
||||
cd build
|
||||
cmake -DPLATFORM=${PLATFORM} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX:PATH=/usr/local ../ || exit 2
|
||||
make -j $(sysctl -n hw.ncpu) package || exit 3
|
||||
cmake -B build -G Ninja -DPLATFORM=${PLATFORM} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX:PATH=/usr/local || exit 2
|
||||
cmake --build build --target package --parallel $(sysctl -n hw.ncpu) || exit 3
|
||||
cd ${GITHUB_WORKSPACE} && source /${GITHUB_WORKSPACE}/test/testrunner.sh || exit 4
|
||||
exit 0;
|
||||
exit 1 || { echo "---> Hyperion compilation failed! Abort"; exit 5; }
|
||||
|
2
.github/workflows/qt5_6.yml
vendored
2
.github/workflows/qt5_6.yml
vendored
@@ -117,7 +117,7 @@ jobs:
|
||||
echo '::group::Update/Install dependencies'
|
||||
brew untap --force homebrew/core homebrew/cask
|
||||
brew update || true
|
||||
brew install qt${{ inputs.qt_version }} vulkan-headers || true
|
||||
brew install qt${{ inputs.qt_version }} vulkan-headers ninja || true
|
||||
echo '::endgroup::'
|
||||
|
||||
- name: 👷 Build
|
||||
|
Reference in New Issue
Block a user