[Notes] [Git][BuildStream/buildstream][master] 2 commits: plugins/elements/cmake.yaml: always specify variable types

[Valentin David <gitlab mg gitlab com>]

Title: GitLab

Valentin David pushed to branch master at BuildStream / buildstream

Commits:

• bc827cc8
  by Abderrahim Kitouni at 2018-11-19T14:55:15Z

  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.
  

• 5fbc5f41
  by Valentin David at 2018-11-19T15:31:05Z

  Merge branch 'abderrahim/cmake-variable-types' into 'master'
  
  plugins/elements/cmake.yaml: always specify variable types
  
  Closes #761
  
  See merge request BuildStream/buildstream!947

2 changed files:

• buildstream/plugins/elements/cmake.yaml
• tests/format/variables.py

Changes:

buildstream/plugins/elements/cmake.yaml

---

...	...	@@ -19,7 +19,7 @@ variables:
19	19	cmake-args: |
20	20
21	21	-DCMAKE_INSTALL_PREFIX:PATH="%{prefix}" \
22		- -DCMAKE_INSTALL_LIBDIR=%{lib} %{cmake-extra} %{cmake-global} %{cmake-local}
	22	+ -DCMAKE_INSTALL_LIBDIR:PATH="%{lib}" %{cmake-extra} %{cmake-global} %{cmake-local}
23	23
24	24	cmake: |
25	25

tests/format/variables.py

---

...	...	@@ -20,7 +20,7 @@ DATA_DIR = os.path.join(
20	20	('autotools.bst', 'make-install', "make -j1 DESTDIR=\"/buildstream-install\" install"),
21	21	('cmake.bst', 'cmake',
22	22	"cmake -B_builddir -H\".\" -G\"Unix Makefiles\" " + "-DCMAKE_INSTALL_PREFIX:PATH=\"/usr\" \\\n" +
23		- "-DCMAKE_INSTALL_LIBDIR=lib "),
	23	+ "-DCMAKE_INSTALL_LIBDIR:PATH=\"lib\" "),
24	24	('distutils.bst', 'python-install',
25	25	"python3 ./setup.py install --prefix \"/usr\" \\\n" +
26	26	"--root \"/buildstream-install\""),
...	...	@@ -46,7 +46,7 @@ def test_defaults(cli, datafiles, tmpdir, target, varname, expected):
46	46	('autotools.bst', 'make-install', "make -j1 DESTDIR=\"/custom/install/root\" install"),
47	47	('cmake.bst', 'cmake',
48	48	"cmake -B_builddir -H\".\" -G\"Ninja\" " + "-DCMAKE_INSTALL_PREFIX:PATH=\"/opt\" \\\n" +
49		- "-DCMAKE_INSTALL_LIBDIR=lib "),
	49	+ "-DCMAKE_INSTALL_LIBDIR:PATH=\"lib\" "),
50	50	('distutils.bst', 'python-install',
51	51	"python3 ./setup.py install --prefix \"/opt\" \\\n" +
52	52	"--root \"/custom/install/root\""),

—
View it on GitLab.
You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.