From kde-commits  Mon Jul 20 21:24:20 2009
From: George Kiagiadakis <gkiagiad () csd ! uoc ! gr>
Date: Mon, 20 Jul 2009 21:24:20 +0000
To: kde-commits
Subject: playground/network/kcall
Message-Id: <1248125060.704852.19600.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=124812507825122

SVN commit 1000124 by gkiagia:

Correction on last commit by andrunko. kcall does not need to link to tpqt4-farsight
and it doesn't need it's includes as well. libqtpfarsight needs the includes and
kcall_handler needs to link to it (as libqtpfarsight is static).

 M  +1 -2      CMakeLists.txt  
 M  +2 -1      libqtpfarsight/CMakeLists.txt  


--- trunk/playground/network/kcall/CMakeLists.txt #1000123:1000124
@@ -33,7 +33,7 @@
 endif (NOT QT4_GLIB_SUPPORT)
 
 
-include_directories(${KDE4_INCLUDES} ${TELEPATHY_QT4_INCLUDE_DIR} ${TELEPATHY_QT4_FARSIGHT_INCLUDE_DIR}
+include_directories(${KDE4_INCLUDES} ${TELEPATHY_QT4_INCLUDE_DIR}
                     ${KNOTIFICATIONITEM_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 add_definitions(${KDE4_DEFINITIONS})
 
@@ -62,7 +62,6 @@
 kde4_add_executable(kcall ${kcall_SRCS})
 target_link_libraries(kcall ${KDE4_KUTILS_LIBS}
                             ${TELEPATHY_QT4_LIBRARIES}
-                            ${TELEPATHY_QT4_FARSIGHT_LIBRARIES}
                             ${KNOTIFICATIONITEM_LIBRARIES}
                             kcallprivate)
 
--- trunk/playground/network/kcall/libqtpfarsight/CMakeLists.txt #1000123:1000124
@@ -1,4 +1,5 @@
 include_directories(${GSTREAMER_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR} ${DBUSGLIB_INCLUDE_DIR}
-                    ${LIBXML2_INCLUDE_DIR} ${TPFARSIGHT_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
+                    ${LIBXML2_INCLUDE_DIR} ${TPFARSIGHT_INCLUDE_DIR}
+                    ${TELEPATHY_QT4_FARSIGHT_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
 kde4_add_library(qtpfarsight STATIC qtfchannel.cpp)