diff options
| -rw-r--r-- | buildstream/plugins/elements/cmake.yaml | 8 | ||||
| -rw-r--r-- | tests/variables/variables.py | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/buildstream/plugins/elements/cmake.yaml b/buildstream/plugins/elements/cmake.yaml index 2ff0db16d..1a3191e24 100644 --- a/buildstream/plugins/elements/cmake.yaml +++ b/buildstream/plugins/elements/cmake.yaml @@ -2,6 +2,8 @@ variables: + build-dir: _builddir + # FIXME: Get a more complete cmake invocation cmake-extra: '' cmake-global: '' @@ -13,10 +15,10 @@ variables: cmake: | - cmake %{cmake-args} + cmake -B%{build-dir} -H. %{cmake-args} - make: make - make-install: make -j1 DESTDIR="%{install-root}" install + make: make -C %{build-dir} + make-install: make -j1 -C %{build-dir} DESTDIR="%{install-root}" install # Set this if the sources cannot handle parallelization. # diff --git a/tests/variables/variables.py b/tests/variables/variables.py index 954298286..47b1ff9c9 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 -DCMAKE_INSTALL_PREFIX:PATH=\"/usr\" \\\n" + + "cmake -B_builddir -H. -DCMAKE_INSTALL_PREFIX:PATH=\"/usr\" \\\n" + "-DCMAKE_INSTALL_LIBDIR=lib"), ('distutils.bst', 'install-commands', "python3 setup.py install --prefix \"/usr\" \\\n" + @@ -66,7 +66,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 -DCMAKE_INSTALL_PREFIX:PATH=\"/opt\" \\\n" + + "cmake -B_builddir -H. -DCMAKE_INSTALL_PREFIX:PATH=\"/opt\" \\\n" + "-DCMAKE_INSTALL_LIBDIR=lib"), ('distutils.bst', 'install-commands', "python3 setup.py install --prefix \"/opt\" \\\n" + |