diff options
| author | Erik Faye-Lund <erik.faye-lund@collabora.com> | 2020-09-29 18:44:21 +0200 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2020-09-30 08:18:21 +0000 |
| commit | 0db015294ea3ada56dc2cec7ba80d495a6040e27 (patch) | |
| tree | 80c36f72e8dfe562f2b21cc333db961184b1c4f0 | |
| parent | b8b0e5ece02c3f8c40f565688263c3bb7007ee52 (diff) | |
docs: cmake -> CMake
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6915>
| -rw-r--r-- | docs/meson.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/meson.rst b/docs/meson.rst index b73d9b276f3..0dc983f975a 100644 --- a/docs/meson.rst +++ b/docs/meson.rst @@ -230,9 +230,9 @@ LLVM Meson includes upstream logic to wrap llvm-config using its standard dependency interface. -As of Meson 0.51.0 Meson can use cmake to find LLVM (the cmake finder +As of Meson 0.51.0 Meson can use CMake to find LLVM (the CMake finder was added in Meson 0.49.0, but LLVM cannot be found until 0.51) Due to -the way LLVM implements its cmake finder it will only find static +the way LLVM implements its CMake finder it will only find static libraries, it will never find libllvm.so. There is also a ``-Dcmake_module_path`` option in this Meson version, which points to the root of an alternative installation (the prefix). For example: @@ -293,7 +293,7 @@ Then configure Meson: See the :ref:`Cross Compilation <cross-compilation>` section for more information. -On Windows (and in other cases), using llvm-config or cmake may be +On Windows (and in other cases), using llvm-config or CMake may be either undesirable or impossible. Meson's solution for this is a `wrap <https://mesonbuild.com/Wrap-dependency-system-manual.html>`__, in this case a "binary wrap". Follow the steps below: |