http://bugs.kde.org/show_bug.cgi?id=169632





--- Comment #2 from Matthew Woehlke <mw_triad users sourceforge net>  
2008-08-26 04:07:56 ---
This hunk fixes tapioca's dependency resolution for an all-in-same-tree build.
Is it OK to commit this plus the attached patch, less the parts that touch
decibel itself (which I don't have building yet)?

Index: tapioca-qt/CMakeLists.txt
===================================================================
--- tapioca-qt/CMakeLists.txt   (revision 852572)
+++ tapioca-qt/CMakeLists.txt   (working copy)
@@ -12,7 +12,12 @@
 set(LIB_INSTALL_DIR          "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}"    
CACHE PATH "The subdirectory relative to the install prefix where libraries
will be installed (default is /lib${LIB_SUFFIX})" FORCE)

 FIND_PACKAGE(Qt4 REQUIRED)
-FIND_PACKAGE(TelepathyQt REQUIRED)
+if(EXISTS ${CMAKE_SOURCE_DIR}/telepathy-qt/)
+   set(TELEPATHY_QT_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/telepathy-qt/include)
+   set(TELEPATHY_QT_LIBRARIES QtTelepathyClient)
+else(EXISTS ${CMAKE_SOURCE_DIR}/telepathy-qt/)
+   FIND_PACKAGE(TelepathyQt REQUIRED)
+endif(EXISTS ${CMAKE_SOURCE_DIR}/telepathy-qt/)
 if (NOT QT_QTDBUS_FOUND)
    message(FATAL_ERROR  "Tapioca-Qt requires Qt4 with QtDBus module in order
to built.")
 endif(NOT QT_QTDBUS_FOUND)


-- 
Configure bugmail: http://bugs.kde.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.
_______________________________________________
Decibel mailing list
[email protected]
https://mail.kde.org/mailman/listinfo/decibel

Reply via email to