Update relevant files after moving meson to build/

Update meson build instructions
This commit is contained in:
Lzu Tao
2018-12-01 23:18:59 +07:00
parent beb13bd87e
commit 0669392937
3 changed files with 15 additions and 8 deletions
+1 -1
View File
@@ -74,7 +74,7 @@ script:
&& python3.5 get-pip.py --user && python3.5 get-pip.py --user
&& rm get-pip.py && rm get-pip.py
&& pip3.5 install --user meson ninja; && pip3.5 install --user meson ninja;
mkdir contrib/meson/build; mkdir build/meson/build;
pushd "$_"; pushd "$_";
meson --buildtype=debug -Dbuild_contrib=true -Dbuild_tests=true .. meson --buildtype=debug -Dbuild_contrib=true -Dbuild_tests=true ..
&& ninja && ninja
+1 -1
View File
@@ -125,7 +125,7 @@ By default, `CMAKE_BUILD_TYPE` is set to `Release`.
#### Meson #### Meson
A Meson project is provided within `contrib/meson`. A Meson project is provided within `build/meson`.
#### Visual Studio (Windows) #### Visual Studio (Windows)
+13 -6
View File
@@ -1,16 +1,23 @@
This Meson project is provided with no guarantee and maintained contrib/meson - Meson build system for zstandard
================================================
Meson is a build system designed to optimize programmer productivity.
It aims to do this by providing simple, out-of-the-box support for
modern software development tools and practices, such as unit tests,
coverage reports, Valgrind, CCache and the like.
This Meson build system is provided with no guarantee and maintained
by Dima Krasner <dima@dimakrasner.com>. by Dima Krasner <dima@dimakrasner.com>.
It outputs one `libzstd`, either shared or static, depending on It outputs one `libzstd`, either shared or static, depending on
`default_library` option. `default_library` option.
How to build ## How to build
============
`cd` to this meson directory (`zstd/contrib/meson`) and type: `cd` to this meson directory (`build/meson`)
```sh ```sh
meson --buildtype=release --strip --prefix=/usr builddir meson --buildtype=release -D with-contrib=true -D with-tests=true -D with-contrib=true builddir
cd builddir cd builddir
ninja # to build ninja # to build
ninja install # to install ninja install # to install
@@ -22,7 +29,7 @@ You might want to install it in staging directory:
DESTDIR=./staging ninja install DESTDIR=./staging ninja install
``` ```
To configure the build, use: To configure build options, use:
```sh ```sh
meson configure meson configure