Commit 5fbc5f41 authored by Valentin David's avatar Valentin David

Merge branch 'abderrahim/cmake-variable-types' into 'master'

plugins/elements/cmake.yaml: always specify variable types

Closes #761

See merge request !947
parents 9f629638 bc827cc8
Pipeline #37137325 passed with stages
in 31 minutes and 45 seconds
......@@ -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: |
......
......@@ -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\""),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment