[Lunar-commits] <moonbase> kde4/base: Adjusting the BUILD by switching to default_cmake_build.
Dennis `stumbles` Veatch
stumbles at lunar-linux.org
Wed Jun 8 09:45:49 CEST 2011
commit d8f6e9352715366c39e13857039f5b97f7b8b14b
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date: Wed Jun 8 03:45:49 2011 -0400
kde4/base: Adjusting the BUILD by switching to default_cmake_build.
---
kde4/base/kdeaccessibility4/BUILD | 8 ++------
kde4/base/kdeadmin4/BUILD | 8 ++------
kde4/base/kdeartwork4/BUILD | 8 ++------
kde4/base/kdebase4-runtime/BUILD | 14 +++++---------
kde4/base/kdebase4-workspace/BUILD | 8 ++------
kde4/base/kdebase4/BUILD | 8 ++------
kde4/base/kdebindings4/BUILD | 8 ++------
kde4/base/kdeedu4/BUILD | 10 +++-------
kde4/base/kdegames4/BUILD | 8 ++------
kde4/base/kdegraphics4/BUILD | 8 ++------
kde4/base/kdelibs4/BUILD | 11 +----------
kde4/base/kdemultimedia4/BUILD | 8 ++------
kde4/base/kdenetwork4/BUILD | 9 +++------
kde4/base/kdepim4-runtime/BUILD | 8 ++------
kde4/base/kdepim4/BUILD | 8 ++------
kde4/base/kdepimlibs4/BUILD | 8 ++------
kde4/base/kdeplasma4-addons/BUILD | 8 ++------
kde4/base/kdesdk4/BUILD | 12 ++----------
kde4/base/kdetoys4/BUILD | 8 ++------
kde4/base/kdeutils4/BUILD | 8 ++------
kde4/base/kdewebdev4/BUILD | 8 ++------
kde4/base/oxygen-icons/BUILD | 8 ++------
22 files changed, 48 insertions(+), 144 deletions(-)
diff --git a/kde4/base/kdeaccessibility4/BUILD b/kde4/base/kdeaccessibility4/BUILD
index 9b966f9..5cad278 100644
--- a/kde4/base/kdeaccessibility4/BUILD
+++ b/kde4/base/kdeaccessibility4/BUILD
@@ -3,10 +3,6 @@
source /etc/profile.d/qt4.rc &&
source /etc/profile.d/kde4.rc &&
- cmake -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX \
- -DCMAKE_BUILD_TYPE=RELEASE \
- $OPTS . &&
-
- default_make
-
+ default_cmake_build
+
) > $C_FIFO 2>&1
diff --git a/kde4/base/kdeadmin4/BUILD b/kde4/base/kdeadmin4/BUILD
index 9b966f9..5cad278 100644
--- a/kde4/base/kdeadmin4/BUILD
+++ b/kde4/base/kdeadmin4/BUILD
@@ -3,10 +3,6 @@
source /etc/profile.d/qt4.rc &&
source /etc/profile.d/kde4.rc &&
- cmake -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX \
- -DCMAKE_BUILD_TYPE=RELEASE \
- $OPTS . &&
-
- default_make
-
+ default_cmake_build
+
) > $C_FIFO 2>&1
diff --git a/kde4/base/kdeartwork4/BUILD b/kde4/base/kdeartwork4/BUILD
index 9b966f9..5cad278 100644
--- a/kde4/base/kdeartwork4/BUILD
+++ b/kde4/base/kdeartwork4/BUILD
@@ -3,10 +3,6 @@
source /etc/profile.d/qt4.rc &&
source /etc/profile.d/kde4.rc &&
- cmake -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX \
- -DCMAKE_BUILD_TYPE=RELEASE \
- $OPTS . &&
-
- default_make
-
+ default_cmake_build
+
) > $C_FIFO 2>&1
diff --git a/kde4/base/kdebase4-runtime/BUILD b/kde4/base/kdebase4-runtime/BUILD
index d084114..7fac86f 100644
--- a/kde4/base/kdebase4-runtime/BUILD
+++ b/kde4/base/kdebase4-runtime/BUILD
@@ -1,18 +1,14 @@
(
- source /etc/profile.d/qt4.rc &&
- source /etc/profile.d/kde4.rc &&
-
- cmake -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX \
- -DCMAKE_BUILD_TYPE=RELEASE \
- $OPTS . &&
-
- default_make &&
+ source /etc/profile.d/qt4.rc &&
+ source /etc/profile.d/kde4.rc &&
+ default_cmake_build &&
+
# This used to be installed by kdelibs4 but will be over written by
# kdebase4-runtime causing a conflict. So lets just move it here from
# kdelibs4 and be done with it.
- install -m0755 $SCRIPT_DIRECTORY/kde4 /usr/bin/
+ install -m0755 $SCRIPT_DIRECTORY/kde4 /usr/bin/
) > $C_FIFO 2>&1
diff --git a/kde4/base/kdebase4-workspace/BUILD b/kde4/base/kdebase4-workspace/BUILD
index 9b966f9..5cad278 100644
--- a/kde4/base/kdebase4-workspace/BUILD
+++ b/kde4/base/kdebase4-workspace/BUILD
@@ -3,10 +3,6 @@
source /etc/profile.d/qt4.rc &&
source /etc/profile.d/kde4.rc &&
- cmake -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX \
- -DCMAKE_BUILD_TYPE=RELEASE \
- $OPTS . &&
-
- default_make
-
+ default_cmake_build
+
) > $C_FIFO 2>&1
diff --git a/kde4/base/kdebase4/BUILD b/kde4/base/kdebase4/BUILD
index 4e8f699..d7f0805 100644
--- a/kde4/base/kdebase4/BUILD
+++ b/kde4/base/kdebase4/BUILD
@@ -5,10 +5,6 @@
export CFLAGS="$CFLAGS -fPIC" &&
- cmake -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX \
- -DCMAKE_BUILD_TYPE=RELEASE \
- $OPTS . &&
-
- default_make
-
+ default_cmake_build
+
) > $C_FIFO 2>&1
diff --git a/kde4/base/kdebindings4/BUILD b/kde4/base/kdebindings4/BUILD
index 9b966f9..5cad278 100644
--- a/kde4/base/kdebindings4/BUILD
+++ b/kde4/base/kdebindings4/BUILD
@@ -3,10 +3,6 @@
source /etc/profile.d/qt4.rc &&
source /etc/profile.d/kde4.rc &&
- cmake -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX \
- -DCMAKE_BUILD_TYPE=RELEASE \
- $OPTS . &&
-
- default_make
-
+ default_cmake_build
+
) > $C_FIFO 2>&1
diff --git a/kde4/base/kdeedu4/BUILD b/kde4/base/kdeedu4/BUILD
index 1789819..5455619 100644
--- a/kde4/base/kdeedu4/BUILD
+++ b/kde4/base/kdeedu4/BUILD
@@ -5,12 +5,8 @@
source /etc/profile.d/qt4.rc &&
source /etc/profile.d/kde4.rc &&
- cmake -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX \
- -DCMAKE_BUILD_TYPE=RELEASE \
- -DEXPERIMENTAL_PYTHON_BINDINGS=TRUE \
- $OPTS . &&
-
- default_make
-
+ OPTS+=" -DEXPERIMENTAL_PYTHON_BINDINGS=TRUE" &&
+
+ default_cmake_build
) > $C_FIFO 2>&1
diff --git a/kde4/base/kdegames4/BUILD b/kde4/base/kdegames4/BUILD
index 9b966f9..5cad278 100644
--- a/kde4/base/kdegames4/BUILD
+++ b/kde4/base/kdegames4/BUILD
@@ -3,10 +3,6 @@
source /etc/profile.d/qt4.rc &&
source /etc/profile.d/kde4.rc &&
- cmake -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX \
- -DCMAKE_BUILD_TYPE=RELEASE \
- $OPTS . &&
-
- default_make
-
+ default_cmake_build
+
) > $C_FIFO 2>&1
diff --git a/kde4/base/kdegraphics4/BUILD b/kde4/base/kdegraphics4/BUILD
index e9aaf44..97ee8cb 100644
--- a/kde4/base/kdegraphics4/BUILD
+++ b/kde4/base/kdegraphics4/BUILD
@@ -8,10 +8,6 @@
source /etc/profile.d/qt4.rc &&
source /etc/profile.d/kde4.rc &&
- cmake -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX \
- -DCMAKE_BUILD_TYPE=RELEASE \
- $OPTS . &&
-
- default_make
-
+ default_cmake_build
+
) > $C_FIFO 2>&1
diff --git a/kde4/base/kdelibs4/BUILD b/kde4/base/kdelibs4/BUILD
index 783f49f..fca97f3 100644
--- a/kde4/base/kdelibs4/BUILD
+++ b/kde4/base/kdelibs4/BUILD
@@ -4,20 +4,11 @@
source /etc/profile.d/qt4.rc &&
- OOSB_DIR="$SOURCE_DIRECTORY/$MODULE-build" &&
-
sed -i "22i /usr/share/sgml/docbook/xml/4.2" cmake/modules/FindDocBookXML.cmake &&
VER=`lvu version docbook-xsl` &&
sedit "s:docbook/xsl-stylesheets:docbook/xsl-stylesheets-$VER:" cmake/modules/FindDocBookXSL.cmake &&
- mkdir $OOSB_DIR &&
- cd $OOSB_DIR &&
-
- cmake -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX \
- -DCMAKE_BUILD_TYPE=RELEASE \
- $OPTS $SOURCE_DIRECTORY &&
-
- default_make
+ default_cmake_build
) > $C_FIFO 2>&1
diff --git a/kde4/base/kdemultimedia4/BUILD b/kde4/base/kdemultimedia4/BUILD
index 9b966f9..5cad278 100644
--- a/kde4/base/kdemultimedia4/BUILD
+++ b/kde4/base/kdemultimedia4/BUILD
@@ -3,10 +3,6 @@
source /etc/profile.d/qt4.rc &&
source /etc/profile.d/kde4.rc &&
- cmake -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX \
- -DCMAKE_BUILD_TYPE=RELEASE \
- $OPTS . &&
-
- default_make
-
+ default_cmake_build
+
) > $C_FIFO 2>&1
diff --git a/kde4/base/kdenetwork4/BUILD b/kde4/base/kdenetwork4/BUILD
index 6b00fc3..d1261ea 100644
--- a/kde4/base/kdenetwork4/BUILD
+++ b/kde4/base/kdenetwork4/BUILD
@@ -7,11 +7,8 @@
mkdir /opt/lunar/plugins
fi &&
- cmake -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX \
- -DCMAKE_BUILD_TYPE=RELEASE \
- -DMOZPLUGIN_INSTALL_DIR=/opt/lunar/plugins \
- $OPTS . &&
-
- default_make
+ OPTS+=" -DMOZPLUGIN_INSTALL_DIR=/opt/lunar/plugins" &&
+ default_cmake_build
+
) > $C_FIFO 2>&1
diff --git a/kde4/base/kdepim4-runtime/BUILD b/kde4/base/kdepim4-runtime/BUILD
index 9b966f9..5cad278 100644
--- a/kde4/base/kdepim4-runtime/BUILD
+++ b/kde4/base/kdepim4-runtime/BUILD
@@ -3,10 +3,6 @@
source /etc/profile.d/qt4.rc &&
source /etc/profile.d/kde4.rc &&
- cmake -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX \
- -DCMAKE_BUILD_TYPE=RELEASE \
- $OPTS . &&
-
- default_make
-
+ default_cmake_build
+
) > $C_FIFO 2>&1
diff --git a/kde4/base/kdepim4/BUILD b/kde4/base/kdepim4/BUILD
index 9b966f9..5cad278 100644
--- a/kde4/base/kdepim4/BUILD
+++ b/kde4/base/kdepim4/BUILD
@@ -3,10 +3,6 @@
source /etc/profile.d/qt4.rc &&
source /etc/profile.d/kde4.rc &&
- cmake -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX \
- -DCMAKE_BUILD_TYPE=RELEASE \
- $OPTS . &&
-
- default_make
-
+ default_cmake_build
+
) > $C_FIFO 2>&1
diff --git a/kde4/base/kdepimlibs4/BUILD b/kde4/base/kdepimlibs4/BUILD
index 9b966f9..5cad278 100644
--- a/kde4/base/kdepimlibs4/BUILD
+++ b/kde4/base/kdepimlibs4/BUILD
@@ -3,10 +3,6 @@
source /etc/profile.d/qt4.rc &&
source /etc/profile.d/kde4.rc &&
- cmake -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX \
- -DCMAKE_BUILD_TYPE=RELEASE \
- $OPTS . &&
-
- default_make
-
+ default_cmake_build
+
) > $C_FIFO 2>&1
diff --git a/kde4/base/kdeplasma4-addons/BUILD b/kde4/base/kdeplasma4-addons/BUILD
index 9b966f9..5cad278 100644
--- a/kde4/base/kdeplasma4-addons/BUILD
+++ b/kde4/base/kdeplasma4-addons/BUILD
@@ -3,10 +3,6 @@
source /etc/profile.d/qt4.rc &&
source /etc/profile.d/kde4.rc &&
- cmake -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX \
- -DCMAKE_BUILD_TYPE=RELEASE \
- $OPTS . &&
-
- default_make
-
+ default_cmake_build
+
) > $C_FIFO 2>&1
diff --git a/kde4/base/kdesdk4/BUILD b/kde4/base/kdesdk4/BUILD
index 6854dc6..e29d7fd 100644
--- a/kde4/base/kdesdk4/BUILD
+++ b/kde4/base/kdesdk4/BUILD
@@ -8,14 +8,6 @@
source /etc/profile.d/qt4.rc &&
source /etc/profile.d/kde4.rc &&
- OOSB_DIR="$SOURCE_DIRECTORY/$MODULE-build" &&
- mkdir $OOSB_DIR &&
- cd $OOSB_DIR &&
-
- cmake -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX \
- -DCMAKE_BUILD_TYPE=RELEASE \
- $OPTS $SOURCE_DIRECTORY &&
-
- default_make
-
+ default_cmake_build
+
) > $C_FIFO 2>&1
diff --git a/kde4/base/kdetoys4/BUILD b/kde4/base/kdetoys4/BUILD
index 9b966f9..ae6f79f 100644
--- a/kde4/base/kdetoys4/BUILD
+++ b/kde4/base/kdetoys4/BUILD
@@ -1,12 +1,8 @@
(
source /etc/profile.d/qt4.rc &&
- source /etc/profile.d/kde4.rc &&
+ source /etc/profile.d/kde4.rc
- cmake -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX \
- -DCMAKE_BUILD_TYPE=RELEASE \
- $OPTS . &&
-
- default_make
+ default_cmake_build
) > $C_FIFO 2>&1
diff --git a/kde4/base/kdeutils4/BUILD b/kde4/base/kdeutils4/BUILD
index 9b966f9..5cad278 100644
--- a/kde4/base/kdeutils4/BUILD
+++ b/kde4/base/kdeutils4/BUILD
@@ -3,10 +3,6 @@
source /etc/profile.d/qt4.rc &&
source /etc/profile.d/kde4.rc &&
- cmake -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX \
- -DCMAKE_BUILD_TYPE=RELEASE \
- $OPTS . &&
-
- default_make
-
+ default_cmake_build
+
) > $C_FIFO 2>&1
diff --git a/kde4/base/kdewebdev4/BUILD b/kde4/base/kdewebdev4/BUILD
index 9b966f9..5cad278 100644
--- a/kde4/base/kdewebdev4/BUILD
+++ b/kde4/base/kdewebdev4/BUILD
@@ -3,10 +3,6 @@
source /etc/profile.d/qt4.rc &&
source /etc/profile.d/kde4.rc &&
- cmake -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX \
- -DCMAKE_BUILD_TYPE=RELEASE \
- $OPTS . &&
-
- default_make
-
+ default_cmake_build
+
) > $C_FIFO 2>&1
diff --git a/kde4/base/oxygen-icons/BUILD b/kde4/base/oxygen-icons/BUILD
index 8d6e385..9f63d7e 100644
--- a/kde4/base/oxygen-icons/BUILD
+++ b/kde4/base/oxygen-icons/BUILD
@@ -5,10 +5,6 @@
source /etc/profile.d/qt4.rc &&
source /etc/profile.d/kde4.rc &&
- cmake -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX \
- -DCMAKE_BUILD_TYPE=RELEASE \
- $OPTS . &&
-
- default_make
-
+ default_cmake_build
+
) > $C_FIFO 2>&1
More information about the Lunar-commits
mailing list