From c2ed3538e429d1ef431c253c5f75429b24bee367 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 20 Mar 2010 13:20:20 +0100 Subject: [PATCH] cmake: - install cmake configfile for host and target build - cosmetics --- config/path | 8 ++++ packages/toolchain/devel/cmake/install | 54 +++++++++++++++++++++++--- 2 files changed, 57 insertions(+), 5 deletions(-) diff --git a/config/path b/config/path index 594d46a366..11f70592ee 100644 --- a/config/path +++ b/config/path @@ -162,6 +162,10 @@ setup_toolchain() { export CXXFLAGS="$TARGET_CXXFLAGS" export LDFLAGS="$TARGET_LDFLAGS" export PKG_CONFIG_PATH="$TARGET_PKG_CONFIG_PATH" + +# set CMAKE configfile for target + export CMAKE_CONF=$ROOT/$TOOLCHAIN/etc/cmake-$TARGET_NAME.conf + elif [ "$1" = host ]; then export AWK=$HOST_AWK export CC=$HOST_CC @@ -178,6 +182,10 @@ setup_toolchain() { export CXXFLAGS="$HOST_CXXFLAGS" export LDFLAGS="$HOST_LDFLAGS" export PKG_CONFIG_PATH="$HOST_PKG_CONFIG_PATH" + +# set CMAKE configfile for host + export CMAKE_CONF=$ROOT/$TOOLCHAIN/etc/cmake-$HOST_NAME.conf + fi } setup_toolchain target diff --git a/packages/toolchain/devel/cmake/install b/packages/toolchain/devel/cmake/install index 25e8e0187a..7c91165e18 100755 --- a/packages/toolchain/devel/cmake/install +++ b/packages/toolchain/devel/cmake/install @@ -2,9 +2,53 @@ . config/options -cp $PKG_BUILD/bin/cmake \ - $PKG_BUILD/bin/cpack \ - $PKG_BUILD/bin/ctest \ - $ROOT/$TOOLCHAIN/bin +mkdir -p $ROOT/$TOOLCHAIN/bin + cp -P $PKG_BUILD/bin/cmake $ROOT/$TOOLCHAIN/bin + cp -P $PKG_BUILD/bin/cpack $ROOT/$TOOLCHAIN/bin + cp -P $PKG_BUILD/bin/ctest $ROOT/$TOOLCHAIN/bin -# $PKG_BUILD/bin/ccmake \ +mkdir -p $ROOT/$TOOLCHAIN/etc + + cat >$ROOT/$TOOLCHAIN/etc/cmake-$TARGET_NAME.conf <$ROOT/$TOOLCHAIN/etc/cmake-$HOST_NAME.conf <