From 2cf8ef70c1bfa88c1cfab446bcc2ce8ff43e5b16 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@x200t.openelec.tv>
Date: Wed, 16 Jun 2010 09:20:51 +0200
Subject: [PATCH] cmake: - merge install script with build script

---
 packages/toolchain/devel/cmake/build   | 51 ++++++++++++++++++++++++
 packages/toolchain/devel/cmake/install | 54 --------------------------
 2 files changed, 51 insertions(+), 54 deletions(-)
 delete mode 100755 packages/toolchain/devel/cmake/install

diff --git a/packages/toolchain/devel/cmake/build b/packages/toolchain/devel/cmake/build
index dec781a303..af1f9797bb 100755
--- a/packages/toolchain/devel/cmake/build
+++ b/packages/toolchain/devel/cmake/build
@@ -9,3 +9,54 @@ cd $PKG_BUILD
 ./configure --no-qt-gui
 
 make
+
+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
+
+mkdir -p $ROOT/$TOOLCHAIN/etc
+
+  cat >$ROOT/$TOOLCHAIN/etc/cmake-$TARGET_NAME.conf <<EOF
+# this one is important
+SET(CMAKE_SYSTEM_NAME Linux)
+#this one not so much
+SET(CMAKE_SYSTEM_VERSION 1)
+
+# specify the cross compiler
+SET(CMAKE_C_COMPILER   $TARGET_CC)
+SET(CMAKE_CXX_COMPILER $TARGET_CXX)
+
+# where is the target environment 
+SET(CMAKE_FIND_ROOT_PATH  $SYSROOT_PREFIX)
+
+# search for programs in the build host directories
+SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+
+# for libraries and headers in the target directories
+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+
+EOF
+
+  cat >$ROOT/$TOOLCHAIN/etc/cmake-$HOST_NAME.conf <<EOF
+# this one is important
+SET(CMAKE_SYSTEM_NAME Linux)
+#this one not so much
+SET(CMAKE_SYSTEM_VERSION 1)
+
+# specify the host compiler
+SET(CMAKE_C_COMPILER   $HOST_CC)
+SET(CMAKE_CXX_COMPILER $HOST_CXX)
+
+# where is the target environment 
+SET(CMAKE_FIND_ROOT_PATH  $ROOT/$TOOLCHAIN)
+
+# search for programs in the build host directories
+SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)
+
+# for libraries and headers in the target directories
+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)
+
+EOF
diff --git a/packages/toolchain/devel/cmake/install b/packages/toolchain/devel/cmake/install
deleted file mode 100755
index 7c91165e18..0000000000
--- a/packages/toolchain/devel/cmake/install
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-
-. config/options
-
-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
-
-mkdir -p $ROOT/$TOOLCHAIN/etc
-
-  cat >$ROOT/$TOOLCHAIN/etc/cmake-$TARGET_NAME.conf <<EOF
-# this one is important
-SET(CMAKE_SYSTEM_NAME Linux)
-#this one not so much
-SET(CMAKE_SYSTEM_VERSION 1)
-
-# specify the cross compiler
-SET(CMAKE_C_COMPILER   $TARGET_CC)
-SET(CMAKE_CXX_COMPILER $TARGET_CXX)
-
-# where is the target environment 
-SET(CMAKE_FIND_ROOT_PATH  $SYSROOT_PREFIX)
-
-# search for programs in the build host directories
-SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-
-# for libraries and headers in the target directories
-SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-
-EOF
-
-  cat >$ROOT/$TOOLCHAIN/etc/cmake-$HOST_NAME.conf <<EOF
-# this one is important
-SET(CMAKE_SYSTEM_NAME Linux)
-#this one not so much
-SET(CMAKE_SYSTEM_VERSION 1)
-
-# specify the host compiler
-SET(CMAKE_C_COMPILER   $HOST_CC)
-SET(CMAKE_CXX_COMPILER $HOST_CXX)
-
-# where is the target environment 
-SET(CMAKE_FIND_ROOT_PATH  $ROOT/$TOOLCHAIN)
-
-# search for programs in the build host directories
-SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)
-
-# for libraries and headers in the target directories
-SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
-SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)
-
-EOF