diff options
author | Abderrahim Kitouni <akitouni@gnome.org> | 2018-10-28 12:32:22 +0100 |
---|---|---|
committer | Valentin David <valentin.david@gmail.com> | 2018-11-19 14:55:15 +0000 |
commit | bc827cc83be7059cf5f1dccd6fa98ff7f15c9da2 (patch) | |
tree | 7e772cc4086cd74df145348dd91121be41f28ea4 | |
parent | 9f629638017e6f8634ae6f665ec12e6e51639b37 (diff) | |
download | buildstream-bc827cc83be7059cf5f1dccd6fa98ff7f15c9da2.tar.gz |
plugins/elements/cmake.yaml: always specify variable types
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 0fb2e715a..ba20d7ce6 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 26bb3db98..46e22d0e6 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\""), |