From b30c6934aae2823c450f3df71988f7bfed73bf6c Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 19 Jun 2014 20:42:10 +0200 Subject: [PATCH] cmake: update to cmake-3.0.0, fix installation Signed-off-by: Stephan Raue --- packages/devel/cmake/package.mk | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/packages/devel/cmake/package.mk b/packages/devel/cmake/package.mk index 01c9610e17..992acd32e2 100644 --- a/packages/devel/cmake/package.mk +++ b/packages/devel/cmake/package.mk @@ -17,12 +17,12 @@ ################################################################################ PKG_NAME="cmake" -PKG_VERSION="2.8.12.1" +PKG_VERSION="3.0.0" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="BSD" PKG_SITE="http://www.cmake.org/" -PKG_URL="http://www.cmake.org/files/v2.8/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="http://www.cmake.org/files/v3.0/$PKG_NAME-$PKG_VERSION.tar.gz" PKG_DEPENDS_HOST="ccache:host" PKG_PRIORITY="optional" PKG_SECTION="toolchain/devel" @@ -33,15 +33,13 @@ PKG_IS_ADDON="no" PKG_AUTORECONF="no" configure_host() { - ../configure --no-qt-gui -- -DBUILD_CursesDialog=0 + ../configure --prefix=$ROOT/$TOOLCHAIN \ + --no-qt-gui \ + -- \ + -DBUILD_CursesDialog=0 } -makeinstall_host() { - mkdir -p $ROOT/$TOOLCHAIN/bin - cp -P bin/cmake $ROOT/$TOOLCHAIN/bin - cp -P bin/cpack $ROOT/$TOOLCHAIN/bin - cp -P bin/ctest $ROOT/$TOOLCHAIN/bin - +post_makeinstall_host() { mkdir -p $ROOT/$TOOLCHAIN/etc cat >$ROOT/$TOOLCHAIN/etc/cmake-$TARGET_NAME.conf <