From 914f75f156ad54cbccd41fb25ee1ce656e2b7cde Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Sun, 7 May 2017 01:32:20 -0300 Subject: [PATCH] core: allow having a list of "cmake" candidates Add the BR2_CMAKE_CANDIDATES variable, containing a list of candidates to check and use as BR2_CMAKE, if possible. This allows using "cmake3" on CentOS 7, whose default cmake corresponds to version 2.8.12. Example: $ make BR2_CMAKE_CANDIDATES="cmake cmake3" Signed-off-by: Carlos Santos Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- support/dependencies/check-host-cmake.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/support/dependencies/check-host-cmake.mk b/support/dependencies/check-host-cmake.mk index 914327fe1a..ef080ff7c6 100644 --- a/support/dependencies/check-host-cmake.mk +++ b/support/dependencies/check-host-cmake.mk @@ -10,9 +10,10 @@ # BR2_CMAKE_VERSION_MIN = 3.1 -BR2_CMAKE ?= cmake -ifeq ($(call suitable-host-package,cmake,\ - $(BR2_CMAKE_VERSION_MIN) $(BR2_CMAKE)),) +BR2_CMAKE_CANDIDATES ?= cmake +BR2_CMAKE ?= $(call suitable-host-package,cmake,\ + $(BR2_CMAKE_VERSION_MIN) $(BR2_CMAKE_CANDIDATES)) +ifeq ($(BR2_CMAKE),) BR2_CMAKE = $(HOST_DIR)/usr/bin/cmake BR2_CMAKE_HOST_DEPENDENCY = host-cmake endif -- 2.30.2