[PATCH] akonadi can't be built in kdesupport

[Matthew Woehlke]

Slightly over-dramatic, but...

I've gotten tired of having to bootstrap kdesupport because akonadi 
thinks it doesn't exist inside of there. I don't think this used to 
happen, but for some time it has been impossible to build (or even 
configure!) kdesupport after nuking the KDE install directory (which I 
have been doing often due to katepart continually breaking).

Patch below fixes it. I will commit this in 1-2 weeks if I don't hear 
otherwise. (But please let me know if I can commit sooner!)

Index: akonadi/cmake/modules/FindSoprano.cmake
===================================================================
--- akonadi/cmake/modules/FindSoprano.cmake     (revision 981221)
+++ akonadi/cmake/modules/FindSoprano.cmake     (working copy)
@@ -37,6 +37,16 @@
  #  set(SopranoIndex_FOUND TRUE)

  #else(SOPRANO_INCLUDE_DIR AND SOPRANO_LIBRARIES AND 
SOPRANO_INDEX_LIBRARIES AND SOPRANO_SERVER_LIBRARIES)
+# Are we using this inside kdesupport ? 

+# Then expect that Soprano is also part of kdesupport: 

+if(KDESupport_SOURCE_DIR) 

+  set(SOPRANO_INCLUDE_DIR ${KDESupport_SOURCE_DIR}/soprano) 

+  set(SOPRANO_INDEX_LIBRARIES sopranoindex) 

+  set(SOPRANO_CLIENT_LIBRARIES sopranoclient) 

+  set(SOPRANO_LIBRARIES soprano) 

+  set(SOPRANO_SERVER_LIBRARIES sopranoserver) 

+  set(Soprano_FOUND TRUE) 

+else() 

    include(FindLibraryWithDebug) 

 

    # have packageconfig set variables to find Soprano: 

@@ -129,8 +139,8 @@ 

        endif(SOPRANO_VERSION STRLESS "${SOPRANO_MIN_VERSION}") 

      endif(SOPRANO_VERSION_MATCH) 

    endif(Soprano_FOUND) 

+endif(KDESupport_SOURCE_DIR) 

 

- 

    #look for parser plugins 

    if(Soprano_FOUND) 

      find_path(SOPRANO_PLUGIN_DIR 

===================================================================

-- 
Matthew
Please do not quote my e-mail address unobfuscated in message bodies.
-- 
 >> This is a big deal, because now some tiny minority has lobbied for
 >> changes that end up hurting everyone else.
 > Yeah, I know. Par for the course. I hate the American government.
Actually, I was talking about X.org...