diff options
| author | John Levon <john.levon@nutanix.com> | 2021-05-20 11:04:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-20 11:04:43 +0100 |
| commit | 3b1f4e00a610dcdba22ac8e86d019944229522a6 (patch) | |
| tree | 4aba764456d6773ef1449382700d727c17c08bc1 /Makefile | |
| parent | 10e5e70b8fd748b10c616f34fe5ffcfa1ac0d998 (diff) | |
| download | libvfio-user-3b1f4e00a610dcdba22ac8e86d019944229522a6.zip libvfio-user-3b1f4e00a610dcdba22ac8e86d019944229522a6.tar.gz libvfio-user-3b1f4e00a610dcdba22ac8e86d019944229522a6.tar.bz2 | |
use cmake3 if available (#503)
Currently, on systems with both cmake and cmake3, we require cmake even if
cmake3 is the only cmake version available (and SPDK encodes this silly
requirement). Use and prefer "cmake3" if available.
Signed-off-by: John Levon <john.levon@nutanix.com>
Reviewed-by: Swapnil Ingle <swapnil.ingle@nutanix.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -47,7 +47,7 @@ ifeq ($(VERBOSE),) MAKEFLAGS += -s endif -CMAKE = cmake +CMAKE = $(shell bash -c "command -v cmake3 cmake" | head -1) BUILD_DIR_BASE = $(CURDIR)/build BUILD_DIR = $(BUILD_DIR_BASE)/$(BUILD_TYPE) @@ -64,13 +64,11 @@ all $(filter-out $(PHONY_TARGETS), $(MAKECMDGOALS)): $(BUILD_DIR)/Makefile # NB: add --capture=no to get a C-level assert failure output. # PYTESTCMD = \ - $(shell which -a pytest-3 /bin/true 2>/dev/null | head -1) \ - -rP \ - --quiet + $(shell bash -c "command -v pytest-3 /bin/true" | head -1) \ + -rP --quiet PYTEST = \ - BUILD_TYPE=$(BUILD_TYPE) \ - $(PYTESTCMD) + BUILD_TYPE=$(BUILD_TYPE) $(PYTESTCMD) # # In our tests, we make sure to destroy the ctx at the end of each test; this is |