From e6c4076ef0e59d4cbbdbbecb22ac57c23e6e69c2 Mon Sep 17 00:00:00 2001 From: Richard Feldman Date: Tue, 17 Sep 2024 14:07:50 -0400 Subject: [PATCH] Add cmake to dev build instructions (#17943) Release Notes: - N/A --- docs/src/development/macos.md | 6 ++++++ docs/src/development/windows.md | 1 + script/linux | 6 ++++++ 3 files changed, 13 insertions(+) diff --git a/docs/src/development/macos.md b/docs/src/development/macos.md index 160ae3dd0e..1407b0f610 100644 --- a/docs/src/development/macos.md +++ b/docs/src/development/macos.md @@ -29,6 +29,12 @@ Clone down the [Zed repository](https://github.com/zed-industries/zed). rustup target add wasm32-wasip1 ``` +- Install `cmake` (required by [a dependency](https://docs.rs/wasmtime-c-api-impl/latest/wasmtime_c_api/)) + + ```sh + brew install cmake + ``` + ## Backend Dependencies If you are developing collaborative features of Zed, you'll need to install the dependencies of zed's `collab` server: diff --git a/docs/src/development/windows.md b/docs/src/development/windows.md index 600c030931..86eb21965e 100644 --- a/docs/src/development/windows.md +++ b/docs/src/development/windows.md @@ -22,6 +22,7 @@ Clone down the [Zed repository](https://github.com/zed-industries/zed). - Install [Visual Studio](https://visualstudio.microsoft.com/downloads/) with the optional component `MSVC v*** - VS YYYY C++ x64/x86 build tools` (`v***` is your VS version and `YYYY` is year when your VS was released) - Install Windows 11 or 10 SDK depending on your system, but ensure that at least `Windows 10 SDK version 2104 (10.0.20348.0)` is installed on your machine. You can download it from the [Windows SDK Archive](https://developer.microsoft.com/windows/downloads/windows-sdk/) +- Install [CMake](https://cmake.org/download) ## Backend dependencies diff --git a/script/linux b/script/linux index 051748ad45..d894d33ea8 100755 --- a/script/linux +++ b/script/linux @@ -25,6 +25,7 @@ if [[ -n $apt ]]; then libvulkan1 libgit2-dev make + cmake clang mold jq @@ -44,6 +45,7 @@ if [[ -n $dnf ]]; then gcc g++ clang + cmake mold alsa-lib-devel fontconfig-devel @@ -78,6 +80,7 @@ if [[ -n $zyp ]]; then gcc-c++ clang make + cmake alsa-devel fontconfig-devel wayland-devel @@ -99,6 +102,7 @@ if [[ -n $pacman ]]; then deps=( gcc clang + cmake alsa-lib fontconfig wayland @@ -122,6 +126,7 @@ if [[ -n $xbps ]]; then deps=( gettext-devel clang + cmake jq elfutils-devel gcc @@ -148,6 +153,7 @@ if [[ -n $emerge ]]; then app-arch/zstd dev-libs/openssl dev-libs/wayland + dev-util/cmake media-libs/alsa-lib media-libs/fontconfig media-libs/vulkan-loader