diff options
| author | Maciej Mrozowski (reavertm) <reavertm@poczta.fm> | 2009-02-11 17:40:39 +0100 |
|---|---|---|
| committer | Maciej Mrozowski (reavertm) <reavertm@poczta.fm> | 2009-02-11 17:40:39 +0100 |
| commit | bfe199b516ce1ce6b4700ce448f15aae0b688cac (patch) | |
| tree | fa9d8f993c13c8532a4498d540d1437ae3e23c65 /eclass/kde4-base.eclass | |
| parent | d2ad12c942bc7003dfbffaf169da857fdc9624f2 (diff) | |
| download | kde-bfe199b516ce1ce6b4700ce448f15aae0b688cac.tar.gz kde-bfe199b516ce1ce6b4700ce448f15aae0b688cac.tar.bz2 kde-bfe199b516ce1ce6b4700ce448f15aae0b688cac.zip | |
Some eclass kdeprefix fixes:
- cmake should look in KDEDIR first - to pick libraries from valid KDE installation when more are present
- detect kdeprefix KDE location only for kde-misc packages (when NEED_KDE is specified) - kde-base packages should just...
install to its KDEDIR right?
Diffstat (limited to 'eclass/kde4-base.eclass')
| -rw-r--r-- | eclass/kde4-base.eclass | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 14b306fbfb7..5a345661cc3 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -301,7 +301,7 @@ if [[ ${NEED_KDE} != none ]]; then *) SLOT="4.1" ;; esac ;; - esac + esac fi fi @@ -442,7 +442,7 @@ kde4-base_pkg_setup() { # Search for best suitable kde installation for misc kde package. # Computation based on NEED_KDE and KDE_MINIMAL - [[ ${NEED_KDE} = latest || ${NEED_KDE} = none ]] && get_latest_kdedir + [[ ${KDEBASE} != kde-base ]] && [[ ${NEED_KDE} = latest || ${NEED_KDE} = none ]] && get_latest_kdedir # Set PREFIX if use kdeprefix; then @@ -551,9 +551,18 @@ kde4-base_src_configure() { QTEST_COLORED=1 QT_PLUGIN_PATH="${KDEDIR}/$(get_libdir)/kde4/plugins/" - # hardcode path to *.cmake KDE files + # Hardcode path to *.pc KDE files export PKG_CONFIG_PATH="${PKG_CONFIG_PATH:+${PKG_CONFIG_PATH}:}${KDEDIR}/$(get_libdir)/pkgconfig" + # Set cmake prefixes to allow buildsystem to localize valid KDE installation when more are present + if use kdeprefix; then + mycmakeargs="${mycmakeargs} + -DCMAKE_SYSTEM_INCLUDE_PATH=${KDEDIR}/include + -DCMAKE_SYSTEM_LIBRARY_PATH=${KDEDIR}/$(get_libdir) + -DCMAKE_SYSTEM_PREFIX_PATH=${KDEDIR} + -DCMAKE_SYSTEM_PROGRAM_PATH=${KDEDIR}/bin" + fi + # additonal arguments for KOFFICE if [[ ${KMNAME} = koffice ]]; then case ${PN} in |