diff options
| author | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2023-02-22 12:42:29 +0100 |
|---|---|---|
| committer | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2023-02-22 12:42:29 +0100 |
| commit | 44b19489e490c02acb949420370d313016945103 (patch) | |
| tree | bb10acf7952924c9fadeba4dd9d0aa950d4b5668 | |
| parent | e32096868274b4162790ed31309d87bc7ba43b14 (diff) | |
| download | glibmm-44b19489e490c02acb949420370d313016945103.tar.gz | |
README.md, CI: meson -> meson setup
| -rw-r--r-- | .gitlab-ci.yml | 12 | ||||
| -rw-r--r-- | README.md | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 58556f31..035543e8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -58,8 +58,8 @@ debug_gcc_build: - mkdir _build && cd _build # -Ddebug=true + -Doptimization=0 correspond to -Dbuildtype=debug # Don't use warning_level and werror. They are applied also to subprojects. - # meson --prefix=/usr --libdir=lib -Ddebug=true -Doptimization=0 -Dwarnings=fatal -Dwarning_level=3 -Dwerror=true - - meson --prefix=/usr --libdir=lib -Ddebug=true -Doptimization=0 -Dwarnings=fatal + # meson setup --prefix=/usr --libdir=lib -Ddebug=true -Doptimization=0 -Dwarnings=fatal -Dwarning_level=3 -Dwerror=true + - meson setup --prefix=/usr --libdir=lib -Ddebug=true -Doptimization=0 -Dwarnings=fatal - meson compile # Must wrap the command in single quotes because of the colon. # See https://gitlab.gnome.org/help/ci/yaml/script.md#use-special-characters-with-script @@ -82,8 +82,8 @@ release_gcc_build: - mkdir _build && cd _build # -Ddebug=false + -Doptimization=3 correspond to -Dbuildtype=release # Don't use warning_level and werror. They are applied also to subprojects. - # meson --prefix=/usr --libdir=lib -Ddebug=false -Doptimization=3 -Dwarnings=fatal -Dwarning_level=3 -Dwerror=true - - meson --prefix=/usr --libdir=lib -Ddebug=false -Doptimization=3 -Dwarnings=fatal + # meson setup --prefix=/usr --libdir=lib -Ddebug=false -Doptimization=3 -Dwarnings=fatal -Dwarning_level=3 -Dwerror=true + - meson setup --prefix=/usr --libdir=lib -Ddebug=false -Doptimization=3 -Dwarnings=fatal - meson compile - 'meson test --suite glibmm:' - meson install @@ -102,8 +102,8 @@ release_clang_build: # -Ddebug=false + -Doptimization=3 correspond to -Dbuildtype=release # Accept warnings. See https://gitlab.gnome.org/GNOME/glibmm/-/issues/98 # Don't use warning_level and werror. They are applied also to subprojects. - # CC=clang CXX=clang++ meson --prefix=/usr --libdir=lib -Ddebug=false -Doptimization=3 -Dwarnings=max -Dwarning_level=3 - - CC=clang CXX=clang++ meson --prefix=/usr --libdir=lib -Ddebug=false -Doptimization=3 -Dwarnings=max + # CC=clang CXX=clang++ meson setup --prefix=/usr --libdir=lib -Ddebug=false -Doptimization=3 -Dwarnings=max -Dwarning_level=3 + - CC=clang CXX=clang++ meson setup --prefix=/usr --libdir=lib -Ddebug=false -Doptimization=3 -Dwarnings=max - meson compile - 'meson test --suite glibmm:' - meson install @@ -32,7 +32,7 @@ other subdirectories of untracked/. Don't call the builddir 'build'. There is a directory called 'build' with files used by Autotools. ``` - $ meson --prefix /some_directory --libdir lib your_builddir . + $ meson setup --prefix /some_directory --libdir lib your_builddir . $ cd your_builddir ``` @@ -89,7 +89,7 @@ Maintainer-mode is enabled by default when you build from a git clone. Don't call the builddir 'build'. There is a directory called 'build' with files used by Autotools. ``` - $ meson --prefix /some_directory --libdir lib your_builddir . + $ meson setup --prefix /some_directory --libdir lib your_builddir . $ cd your_builddir $ ninja $ ninja install |