Patch to fix order of includes in kactivities (for FreeBSD)

Alberto Villa avilla at FreeBSD.org
Sat Jul 7 00:24:40 UTC 2012


Hello!

I'd like someone to approve the attached patch which fixes the order
of include directories in kactivities/services. It is required on
FreeBSD to be able to build kactivities port when KDE-Libs 3 is
installed (we install KDE SC 4 to non-default prefix, so if Soprano
include directory is included prior to Nepomuk one, KDE-Libs 3 headers
are included). Also, it's better to rely on FindNepomuk.cmake to
include Soprano directories, instead of doing it by hand here.

I have a KDE commit bit, so I can commit it.

Please, CC me as I'm not on list.
-- 
Alberto Villa, FreeBSD committer <avilla at FreeBSD.org>
http://people.FreeBSD.org/~avilla
-------------- next part --------------
--- ./service/CMakeLists.txt.orig	2012-07-06 13:49:24.983109174 +0200
+++ ./service/CMakeLists.txt	2012-07-06 18:46:20.503024524 +0200
@@ -18,7 +18,7 @@
 
 if(Nepomuk_FOUND)
     set(HAVE_NEPOMUK 1)
-    include_directories(${SOPRANO_INCLUDE_DIR})
+    include_directories(${NEPOMUK_INCLUDE_DIRS})
     set(ADDITIONAL_LINK_LIBS
         ${ADDITIONAL_LINK_LIBS}
         ${NEPOMUK_LIBRARIES}


More information about the Plasma-devel mailing list