Skip to content

Commit

Permalink
Documentation+Toolchain: Don't try to build CMake from source
Browse files Browse the repository at this point in the history
This build step is a bit excessive. Let's require people to have an
up-to-date CMake from their system package manager instead.
  • Loading branch information
ADKaster authored and awesomekling committed Jul 15, 2024
1 parent 182f83d commit 31eec0a
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 90 deletions.
2 changes: 1 addition & 1 deletion Documentation/BuildInstructionsLadybird.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ NOTE: In all of the below lists of packages, the Qt6 multimedia package is not n
```bash
sudo apt install autoconf autoconf-archive automake build-essential git cmake libavcodec-dev libgl1-mesa-dev nasm \
ninja-build qt6-base-dev qt6-tools-dev-tools qt6-multimedia-dev qt6-wayland ccache fonts-liberation2 \
zip unzip curl tar libssl-dev
zip unzip curl tar
```

#### CMake 3.25 or newer:
Expand Down
6 changes: 0 additions & 6 deletions Meta/CMake/cmake-version.cmake

This file was deleted.

9 changes: 0 additions & 9 deletions Meta/ladybird.sh
Original file line number Diff line number Diff line change
Expand Up @@ -153,20 +153,11 @@ delete_target() {
[ ! -d "$BUILD_DIR" ] || rm -rf "$BUILD_DIR"
}

build_cmake() {
echo "CMake version too old: build_cmake"
( cd "$LADYBIRD_SOURCE_DIR/Toolchain" && ./BuildCMake.sh )
}

build_vcpkg() {
( cd "$LADYBIRD_SOURCE_DIR/Toolchain" && ./BuildVcpkg.sh )
}

ensure_toolchain() {
if [ "$(cmake -P "$LADYBIRD_SOURCE_DIR"/Meta/CMake/cmake-version.cmake)" -ne 1 ]; then
build_cmake
fi

build_vcpkg
}

Expand Down
74 changes: 0 additions & 74 deletions Toolchain/BuildCMake.sh

This file was deleted.

0 comments on commit 31eec0a

Please sign in to comment.