From 2d7290eef0f84fc14ebfc0b1add85ff53e91a87c Mon Sep 17 00:00:00 2001 From: Michael Pyne Date: Sat, 1 Jan 2011 17:55:42 +0000 Subject: [PATCH] Actually, prefer single strigi module to individual submodules. kdepepo tells me that the submodules /do/ require some of the special variables from their supermodule (which makes sense). Turns out I built-in a way a long time ago to force CMake to run when needed, so let's just go that route. This should hopefully complete the support needed for strigi for good until kdesrc-build uses the projects.xml that is under development. BUG:261638 CCMAIL:cgiboudeaux@gmail.com svn path=/trunk/KDE/kdesdk/scripts/kdesrc-buildrc-sample; revision=1210660 --- kdesrc-buildrc-sample | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/kdesrc-buildrc-sample b/kdesrc-buildrc-sample index dc2982d..f7ee219 100644 --- a/kdesrc-buildrc-sample +++ b/kdesrc-buildrc-sample @@ -198,9 +198,14 @@ end module-set # This set includes the modules required for the "strigi" file analyzer, used to extract # information contained in various file types for Dolphin previews, Nepomuk tagging, etc. +# Because of the way the strigi git module is setup, CMake *must* be run in order to +# complete the source code update. This is handled by the "reconfigure" option. In addition, +# a special option to CMake is required to get the strigi build system to complete the +# update. module-set - use-modules libstreams libstreamanalyzer strigiutils strigidaemon strigiclient - + use-modules strigi + cmake-options -DSTRIGI_SYNC_SUBMODULES=TRUE + reconfigure true # CMake needs to always be run to finish the update. repository kde-git end module-set