diff options
| author | Abderrahim Kitouni <akitouni@gnome.org> | 2018-10-28 12:32:22 +0100 |
|---|---|---|
| committer | Abderrahim Kitouni <akitouni@gnome.org> | 2019-08-15 23:45:12 +0100 |
| commit | 9c61f95708954ef870c1c106f09fd955ac2e13a1 (patch) | |
| tree | cacb2030587303883025a8a2b6cd5c718ae2752d | |
| parent | e48a03b2b226f1748edf5c2d5e28093da7ca6a1a (diff) | |
| download | buildstream-abderrahim/backport-947.tar.gz | |
plugins/elements/cmake.yaml: always specify variable typesabderrahim/backport-947
cmake sometimes misinterprets relative paths as relative to the current directory
if this is not specified. See freedesktop-sdk/freedesktop-sdk#431
adjust tests/format/variables.py accordingly.
| -rw-r--r-- | buildstream/plugins/elements/cmake.yaml | 2 | ||||
| -rw-r--r-- | tests/format/variables.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/buildstream/plugins/elements/cmake.yaml b/buildstream/plugins/elements/cmake.yaml index b51727b04..0eca2b3b8 100644 --- a/buildstream/plugins/elements/cmake.yaml +++ b/buildstream/plugins/elements/cmake.yaml @@ -19,7 +19,7 @@ variables: cmake-args: | -DCMAKE_INSTALL_PREFIX:PATH="%{prefix}" \ - -DCMAKE_INSTALL_LIBDIR=%{lib} %{cmake-extra} %{cmake-global} %{cmake-local} + -DCMAKE_INSTALL_LIBDIR:PATH="%{lib}" %{cmake-extra} %{cmake-global} %{cmake-local} cmake: | diff --git a/tests/format/variables.py b/tests/format/variables.py index d01d87e5b..098837af3 100644 --- a/tests/format/variables.py +++ b/tests/format/variables.py @@ -20,7 +20,7 @@ DATA_DIR = os.path.join( ('autotools.bst', 'make-install', "make -j1 DESTDIR=\"/buildstream-install\" install"), ('cmake.bst', 'cmake', "cmake -B_builddir -H. -G\"Unix Makefiles\" -DCMAKE_INSTALL_PREFIX:PATH=\"/usr\" \\\n" + - "-DCMAKE_INSTALL_LIBDIR=lib "), + "-DCMAKE_INSTALL_LIBDIR:PATH=\"lib\" "), ('distutils.bst', 'python-install', "python3 setup.py install --prefix \"/usr\" \\\n" + "--root \"/buildstream-install\""), @@ -46,7 +46,7 @@ def test_defaults(cli, datafiles, tmpdir, target, varname, expected): ('autotools.bst', 'make-install', "make -j1 DESTDIR=\"/custom/install/root\" install"), ('cmake.bst', 'cmake', "cmake -B_builddir -H. -G\"Ninja\" -DCMAKE_INSTALL_PREFIX:PATH=\"/opt\" \\\n" + - "-DCMAKE_INSTALL_LIBDIR=lib "), + "-DCMAKE_INSTALL_LIBDIR:PATH=\"lib\" "), ('distutils.bst', 'python-install', "python3 setup.py install --prefix \"/opt\" \\\n" + "--root \"/custom/install/root\""), |