summaryrefslogtreecommitdiff
path: root/eclass/kde4-base.eclass
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2009-02-14 00:00:19 +0100
committerTomas Chvatal <scarabeus@gentoo.org>2009-02-14 00:00:19 +0100
commit094f35c76b70aa677248328ec2cf0a96a55884cf (patch)
tree496d75e2c6c5c5f675ecb26bf6e6c6e64c614174 /eclass/kde4-base.eclass
parenta54b45fcbd62bc77406cadd3157d7150469450ae (diff)
downloadkde-094f35c76b70aa677248328ec2cf0a96a55884cf.tar.gz
kde-094f35c76b70aa677248328ec2cf0a96a55884cf.tar.bz2
kde-094f35c76b70aa677248328ec2cf0a96a55884cf.zip
Koffice play NO 1. now i probably break koffice but reaver wants to continue so i am sharing my work
Diffstat (limited to 'eclass/kde4-base.eclass')
-rw-r--r--eclass/kde4-base.eclass20
1 files changed, 2 insertions, 18 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index aeec3622ca5..d0284830344 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -567,23 +567,6 @@ kde4-base_src_configure() {
-DCMAKE_SYSTEM_PROGRAM_PATH=${KDEDIR}/bin"
fi
- # additonal arguments for KOFFICE
- if [[ ${KMNAME} = koffice ]]; then
- case ${PN} in
- koffice-data) : ;;
- *)
- mycmakeargs="${mycmakeargs}
- -DWITH_OpenEXR=ON
- $(cmake-utils_use_with crypt QCA2)
- $(cmake-utils_use_with opengl OpenGL)"
- if use crypt; then
- mycmakeargs="${mycmakeargs}
- -DQCA2_LIBRARIES=/usr/$(get_libdir)/qca2/libqca.so.2"
- fi
- ;;
- esac
- fi
-
[ -e CMakeLists.txt ] && cmake-utils_src_configure
}
@@ -617,7 +600,8 @@ kde4-base_src_test() {
# Override this value, set in kde4-base_src_configure()
mycmakeargs="${mycmakeargs} -DKDE4_BUILD_TESTS=ON"
- cmake-utils_src_compile
+ cmake-utils_src_configure
+ kde4-base_src_compile
cmake-utils_src_test
}