From 0a40cddc640afd57b50b7d53ca572d4c5655f464 Mon Sep 17 00:00:00 2001 From: "drenfong.wang" Date: Thu, 14 Feb 2019 06:22:00 +0000 Subject: use cmake3 in centos Change-Id: I9e87ff1de585eb1986971b4a6116658812241415 Signed-off-by: drenfong.wang --- Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index d2df286..344cc4c 100644 --- a/Makefile +++ b/Makefile @@ -30,8 +30,10 @@ endif ifeq ($(filter ubuntu debian,$(OS_ID)),$(OS_ID)) PKG=deb +cmake=cmake else ifeq ($(filter rhel centos fedora opensuse opensuse-leap opensuse-tumbleweed,$(OS_ID)),$(OS_ID)) PKG=rpm +cmake=cmake3 endif # +libganglia1-dev if building the gmond plugin @@ -41,7 +43,7 @@ DEB_DEPENDS += bison flex libpcre3-dev libev-dev libavl-dev libprotobuf-c-dev pr DEB_DEPENDS += cmake ninja-build python-pkgconfig python-dev libssl-dev indent wget RPM_DEPENDS = curl autoconf automake ccache bison flex pcre-devel libev-devel protobuf-c-devel protobuf-c-compiler libcmocka-devel -RPM_DEPENDS += cmake ninja-build python-pkgconfig python-devel openssl-devel graphviz wget gcc gcc-c++ indent git +RPM_DEPENDS += cmake ninja-build python-pkgconfig python-devel openssl-devel graphviz wget gcc gcc-c++ indent git cmake3 ifeq ($(findstring y,$(UNATTENDED)),y) CONFIRM=-y @@ -198,11 +200,11 @@ build-plugins: @mkdir -p $(BR)/build-plugins/;cd $(BR)/build-plugins/;cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr $(WS_ROOT)/src/plugins/;make install; build-package: - @mkdir -p $(BR)/build-package/;cd $(BR)/build-package/;cmake $(WS_ROOT)/src/;make package;rm -rf $(BR)/build-package/_CPack_Packages; + @mkdir -p $(BR)/build-package/;cd $(BR)/build-package/;$(cmake) $(WS_ROOT)/src/;make package;rm -rf $(BR)/build-package/_CPack_Packages; clean: @cd $(BR)/build-scvpp && make clean; @cd $(BR)/build-plugins && make clean; - + @cd $(BR)/build-package && make clean; distclean: @rm -rf $(BR)/build-scvpp @rm -rf $(BR)/build-plugins -- cgit 1.2.3-korg