mirror of
https://github.com/RGBCube/serenity
synced 2025-07-28 18:17:34 +00:00
Ladybird+Meta: Make the AppKit chrome the default on macOS
The Qt chrome is still available and may be enabled with CMake.
This commit is contained in:
parent
4549d6cf1b
commit
1682e46df9
4 changed files with 23 additions and 37 deletions
|
@ -168,23 +168,6 @@ jobs:
|
|||
SERENITY_SOURCE_DIR: '$(Build.SourcesDirectory)'
|
||||
QT_QPA_PLATFORM: 'offscreen'
|
||||
|
||||
- ${{ if and(eq(parameters.fuzzer, 'NoFuzz'), eq(parameters.os, 'macOS') ) }}:
|
||||
- script: |
|
||||
set -e
|
||||
cmake -DENABLE_QT=OFF -B Build
|
||||
displayName: 'Enable the Ladybird AppKit chrome'
|
||||
workingDirectory: $(Build.SourcesDirectory)/Meta/Lagom
|
||||
env:
|
||||
CCACHE_DIR: '$(SERENITY_CCACHE_DIR)'
|
||||
|
||||
- script: |
|
||||
set -e
|
||||
cmake --build .
|
||||
displayName: 'Build Ladybird AppKit chrome'
|
||||
workingDirectory: $(Build.SourcesDirectory)/Meta/Lagom/Build
|
||||
env:
|
||||
CCACHE_DIR: '$(SERENITY_CCACHE_DIR)'
|
||||
|
||||
- ${{ if eq(parameters.lagom_lints, true) }}:
|
||||
- script: |
|
||||
set -e
|
||||
|
|
|
@ -111,15 +111,6 @@ CMAKE_ARGS+=( "-DSERENITY_TOOLCHAIN=$TOOLCHAIN_TYPE" )
|
|||
|
||||
CMD_ARGS=( "$@" )
|
||||
|
||||
LADYBIRD_ENABLE_QT=1
|
||||
|
||||
if [ "$TARGET" = "lagom" ]; then
|
||||
if [ "${CMD_ARGS[0]}" = "ladybird-appkit" ]; then
|
||||
CMD_ARGS[0]="ladybird"
|
||||
LADYBIRD_ENABLE_QT=0
|
||||
fi
|
||||
fi
|
||||
|
||||
get_top_dir() {
|
||||
git rev-parse --show-toplevel
|
||||
}
|
||||
|
@ -140,7 +131,7 @@ is_valid_target() {
|
|||
if [ "$TARGET" = "lagom" ]; then
|
||||
CMAKE_ARGS+=("-DBUILD_LAGOM=ON")
|
||||
if [ "${CMD_ARGS[0]}" = "ladybird" ]; then
|
||||
CMAKE_ARGS+=("-DENABLE_LAGOM_LADYBIRD=ON" "-DENABLE_QT=${LADYBIRD_ENABLE_QT}")
|
||||
CMAKE_ARGS+=("-DENABLE_LAGOM_LADYBIRD=ON")
|
||||
fi
|
||||
return 0
|
||||
fi
|
||||
|
@ -211,7 +202,7 @@ build_target() {
|
|||
# invoked superbuild for serenity target that doesn't set -DBUILD_LAGOM=ON
|
||||
local EXTRA_CMAKE_ARGS=()
|
||||
if [ "${CMD_ARGS[0]}" = "ladybird" ]; then
|
||||
EXTRA_CMAKE_ARGS=("-DENABLE_LAGOM_LADYBIRD=ON" "-DENABLE_QT=${LADYBIRD_ENABLE_QT}")
|
||||
EXTRA_CMAKE_ARGS=("-DENABLE_LAGOM_LADYBIRD=ON")
|
||||
fi
|
||||
cmake -S "$SERENITY_SOURCE_DIR/Meta/Lagom" -B "$BUILD_DIR" -DBUILD_LAGOM=ON "${EXTRA_CMAKE_ARGS[@]}"
|
||||
fi
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue