Merge pull request #42 from apache/tristan/fix-missing-verbosity
meson, cmake: Ensure verbosity
diff --git a/src/buildstream_plugins/elements/cmake.yaml b/src/buildstream_plugins/elements/cmake.yaml
index 8dfab1d..aaf5c33 100644
--- a/src/buildstream_plugins/elements/cmake.yaml
+++ b/src/buildstream_plugins/elements/cmake.yaml
@@ -27,6 +27,7 @@
cmake-args: |
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX:PATH="%{prefix}" \
-DCMAKE_INSTALL_LIBDIR:PATH="%{lib}" %{cmake-global} %{cmake-local}
@@ -72,10 +73,8 @@
# Use max-jobs CPUs for building and enable verbosity
environment:
JOBS: -j%{max-jobs}
- V: 1
-# And dont consider JOBS or V as something which may
+# And dont consider JOBS as something which may
# affect build output.
environment-nocache:
- JOBS
-- V
diff --git a/src/buildstream_plugins/elements/meson.yaml b/src/buildstream_plugins/elements/meson.yaml
index 2db56b8..3ec2ece 100644
--- a/src/buildstream_plugins/elements/meson.yaml
+++ b/src/buildstream_plugins/elements/meson.yaml
@@ -40,7 +40,7 @@
meson: meson setup %{conf-root} %{build-dir} %{meson-args}
meson-build: |
- ninja -j ${JOBS} -C %{build-dir}
+ ninja -v -j ${JOBS} -C %{build-dir}
meson-install: |
env DESTDIR="%{install-root}" meson install -C %{build-dir} --no-rebuild
diff --git a/tests/cachekey/project/elements/cmake1.expected b/tests/cachekey/project/elements/cmake1.expected
index 1401206..75e8874 100644
--- a/tests/cachekey/project/elements/cmake1.expected
+++ b/tests/cachekey/project/elements/cmake1.expected
@@ -1 +1 @@
-8f1eecc3592e71c82de005be84701025ae0f104a33f5f49f5b117743e79e4281
\ No newline at end of file
+d76a32a55035f8ca8a31634490400657f73efe6ec5d8fbc28393c98f482262de
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/meson1.expected b/tests/cachekey/project/elements/meson1.expected
index c2f6bbe..75f1aa6 100644
--- a/tests/cachekey/project/elements/meson1.expected
+++ b/tests/cachekey/project/elements/meson1.expected
@@ -1 +1 @@
-45b6ba4192ce48788b202a02255075f0c479cf42dc7ae8316df65709f72a1a97
\ No newline at end of file
+e971e99926950e605d88f3d65edd1bad584a2b2a23943460aa48250be889622f
\ No newline at end of file
diff --git a/tests/cachekey/project/target.expected b/tests/cachekey/project/target.expected
index ff90caa..d2a179a 100644
--- a/tests/cachekey/project/target.expected
+++ b/tests/cachekey/project/target.expected
@@ -1 +1 @@
-1be743d355c5c35502565185d9922213f0667b355abf5e6a3f88594d0fd64f96
\ No newline at end of file
+3dc2ed8ab56f9c706e1fbf4bacc1ab1e38d20f66c686f1ab05d5ad0e504272fc
\ No newline at end of file
