diff options
| author | Javier Jardón <jjardon@gnome.org> | 2018-01-17 17:28:50 +0000 |
|---|---|---|
| committer | Javier Jardón <jjardon@gnome.org> | 2018-01-17 17:48:20 +0000 |
| commit | d01b9141cb17aded7041ee13639dd2b3d9c9d931 (patch) | |
| tree | 039c67f558b23d045dbbced15329c06da6546792 | |
| parent | b7099b125ef9c4cd1c1105648f5992b4f4a63fe4 (diff) | |
| download | buildstream-jjardon/cmake_ninja.tar.gz | |
buildstream/plugins/elements/cmake.yaml: Use ninja instead makejjardon/cmake_ninja
| -rw-r--r-- | buildstream/plugins/elements/cmake.yaml | 24 | ||||
| -rw-r--r-- | tests/variables/variables.py | 4 |
2 files changed, 15 insertions, 13 deletions
diff --git a/buildstream/plugins/elements/cmake.yaml b/buildstream/plugins/elements/cmake.yaml index 1a3191e24..9080e651d 100644 --- a/buildstream/plugins/elements/cmake.yaml +++ b/buildstream/plugins/elements/cmake.yaml @@ -15,10 +15,13 @@ variables: cmake: | - cmake -B%{build-dir} -H. %{cmake-args} + cmake -B%{build-dir} -H. -GNinja %{cmake-args} - make: make -C %{build-dir} - make-install: make -j1 -C %{build-dir} DESTDIR="%{install-root}" install + ninja: | + ninja -j ${NINJAJOBS} -C %{build-dir} + + ninja-install: | + env DESTDIR="%{install-root}" ninja -C %{build-dir} install # Set this if the sources cannot handle parallelization. # @@ -36,14 +39,14 @@ config: # build-commands: - | - %{make} + %{ninja} # Commands for installing the software into a # destination folder # install-commands: - | - %{make-install} + %{ninja-install} # Commands for stripping debugging information out of # installed binaries @@ -52,13 +55,12 @@ config: - | %{strip-binaries} -# Use max-jobs CPUs for building and enable verbosity +# Use max-jobs CPUs for building environment: - MAKEFLAGS: -j%{max-jobs} - V: 1 + NINJAJOBS: | + %{max-jobs} -# And dont consider MAKEFLAGS or V as something which may +# And dont consider NINJAJOBS as something which may # effect build output. environment-nocache: -- MAKEFLAGS -- V +- NINJAJOBS diff --git a/tests/variables/variables.py b/tests/variables/variables.py index 24f323c69..6623b92ea 100644 --- a/tests/variables/variables.py +++ b/tests/variables/variables.py @@ -45,7 +45,7 @@ def assert_command(datafiles, tmpdir, target, command, expected): @pytest.mark.parametrize("target,command,expected", [ ('autotools.bst', 'install-commands', "make -j1 DESTDIR=\"/buildstream/install\" install"), ('cmake.bst', 'configure-commands', - "cmake -B_builddir -H. -DCMAKE_INSTALL_PREFIX:PATH=\"/usr\" \\\n" + + "cmake -B_builddir -H. -GNinja -DCMAKE_INSTALL_PREFIX:PATH=\"/usr\" \\\n" + "-DCMAKE_INSTALL_LIBDIR=lib"), ('distutils.bst', 'install-commands', "python3 setup.py install --prefix \"/usr\" \\\n" + @@ -65,7 +65,7 @@ def test_defaults(datafiles, tmpdir, target, command, expected): @pytest.mark.parametrize("target,command,expected", [ ('autotools.bst', 'install-commands', "make -j1 DESTDIR=\"/custom/install/root\" install"), ('cmake.bst', 'configure-commands', - "cmake -B_builddir -H. -DCMAKE_INSTALL_PREFIX:PATH=\"/opt\" \\\n" + + "cmake -B_builddir -H. -GNinja -DCMAKE_INSTALL_PREFIX:PATH=\"/opt\" \\\n" + "-DCMAKE_INSTALL_LIBDIR=lib"), ('distutils.bst', 'install-commands', "python3 setup.py install --prefix \"/opt\" \\\n" + |