mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-07-28 11:49:44 +00:00
Meta: Always invoke BuildVcpkg from ladybird.py's build command
We were previously only invoking it if the Build directory didn't exist. We need to always invoke it to handle vcpkg baseline updates.
This commit is contained in:
parent
64f09b520d
commit
8d4ac42205
Notes:
github-actions[bot]
2025-05-22 16:22:27 +00:00
Author: https://github.com/trflynn89
Commit: 8d4ac42205
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/4844
1 changed files with 6 additions and 5 deletions
|
@ -214,17 +214,18 @@ def main():
|
|||
|
||||
|
||||
def configure_main(platform: Platform, preset: str, cc: str, cxx: str) -> Path:
|
||||
ladybird_source_dir, build_preset_dir, build_env_cmake_args = configure_build_env(preset, cc, cxx)
|
||||
build_vcpkg()
|
||||
|
||||
if build_preset_dir.joinpath("build.ninja").exists() or build_preset_dir.joinpath("ladybird.sln").exists():
|
||||
return build_preset_dir
|
||||
|
||||
cmake_args = []
|
||||
|
||||
host_system = platform.host_system
|
||||
if host_system == HostSystem.Linux and platform.host_architecture == HostArchitecture.AArch64:
|
||||
cmake_args.extend(configure_skia_jemalloc())
|
||||
|
||||
ladybird_source_dir, build_preset_dir, build_env_cmake_args = configure_build_env(preset, cc, cxx)
|
||||
if build_preset_dir.joinpath("build.ninja").exists() or build_preset_dir.joinpath("ladybird.sln").exists():
|
||||
return build_preset_dir
|
||||
|
||||
build_vcpkg()
|
||||
validate_cmake_version()
|
||||
|
||||
config_args = [
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue