From kde-commits  Wed Oct 07 09:23:58 2009
From: Till Adam <adam () kde ! org>
Date: Wed, 07 Oct 2009 09:23:58 +0000
To: kde-commits
Subject: branches/work/akonadi-ports/kdepim
Message-Id: <1254907438.751035.1604.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=125490744822730

SVN commit 1032200 by tilladam:

Link the required libraries.

 M  +9 -3      kontact/src/CMakeLists.txt  
 M  +2 -1      korganizer/CMakeLists.txt  
 M  +1 -1      korganizer/koapp.cpp  
 M  +1 -1      korganizer/koglobals.cpp  


--- branches/work/akonadi-ports/kdepim/kontact/src/CMakeLists.txt #1032199:1032200
@@ -1,7 +1,11 @@
 
 add_subdirectory( about ) 
 
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
+include_directories(
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_SOURCE_DIR}/kontactinterfaces 
+    ${CMAKE_SOURCE_DIR}/libkdepimdbusinterfaces
+    )
 
 ########### next target ###############
 
@@ -16,7 +20,7 @@
 
 kde4_add_library(kontactprivate SHARED ${kontactprivate_LIB_SRCS})
 
-target_link_libraries(kontactprivate  ${KDE4_KPARTS_LIBS} ${KDEPIMLIBS_KONTACTINTERFACE_LIBS} ${KDE4_KUTILS_LIBS} ${KDE4_KHTML_LIBRARY} ${KDEPIMLIBS_KPIMUTILS_LIBS} kdepim ${KDE4_KDE3SUPPORT_LIBRARY} ${QT_QT3SUPPORT_LIBRARY})
+target_link_libraries(kontactprivate  ${KDE4_KPARTS_LIBS} ${KDEPIMLIBS_KONTACTINTERFACE_LIBS} ${KDE4_KUTILS_LIBS} ${KDE4_KHTML_LIBRARY} ${KDEPIMLIBS_KPIMUTILS_LIBS} kdepim ${KDE4_KDE3SUPPORT_LIBRARY} ${QT_QT3SUPPORT_LIBRARY} kdepimdbusinterfaces)
 
 set_target_properties(kontactprivate PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
 install(TARGETS kontactprivate ${INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
@@ -46,7 +50,9 @@
 
 
 
-target_link_libraries(kcm_kontact  ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${KDE4_KUTILS_LIBS} kdepim kontactprivate ${QT_QT3SUPPORT_LIBRARY})
+target_link_libraries(kcm_kontact  ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${KDE4_KUTILS_LIBS} kontactprivate
+    kdepim 
+    ${QT_QT3SUPPORT_LIBRARY})
 
 install(TARGETS kcm_kontact  DESTINATION ${PLUGIN_INSTALL_DIR})
 
--- branches/work/akonadi-ports/kdepim/korganizer/CMakeLists.txt #1032199:1032200
@@ -46,6 +46,7 @@
                       ${CMAKE_SOURCE_DIR}/korganizer/printing
                       ${CMAKE_SOURCE_DIR}/kdgantt1
                       ${CMAKE_BINARY_DIR}/libkdepim
+                      ${CMAKE_SOURCE_DIR}/libkdepimdbusinterfaces
                       ${CMAKE_BINARY_DIR}/libkdepimdbusinterfaces
                       ${AKONADI_INCLUDE_DIR}
                       ${Boost_INCLUDE_DIRS}
@@ -117,7 +118,7 @@
   kde4_add_library(korganizer_eventviewer SHARED ${korganizer_eventviewer_LIB_SRCS})
   add_dependencies(korganizer_eventviewer kmail_xml)
 
-  target_link_libraries(korganizer_eventviewer ${KDE4_KPARTS_LIBS} ${KDEPIMLIBS_KCAL_LIBS} kdepim)
+  target_link_libraries(korganizer_eventviewer ${KDE4_KPARTS_LIBS} ${KDEPIMLIBS_KCAL_LIBS} kdepim kdepimdbusinterfaces)
 
   set_target_properties(korganizer_eventviewer PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
   install(TARGETS korganizer_eventviewer ${INSTALL_TARGETS_DEFAULT_ARGS})
--- branches/work/akonadi-ports/kdepim/korganizer/koapp.cpp #1032199:1032200
@@ -35,7 +35,7 @@
 #include "calendarview.h"
 #include "stdcalendar.h"
 
-#include <libkdepim/reminderclient.h>
+#include "reminderclient.h"
 
 #include <kcal/calformat.h>
 #include <kcal/calendarresources.h>
--- branches/work/akonadi-ports/kdepim/korganizer/koglobals.cpp #1032199:1032200
@@ -26,7 +26,7 @@
 #include "koprefs.h"
 #include "korganizer_part.h"
 
-#include <libkdepim/reminderclient.h>
+#include "reminderclient.h"
 
 #include <kholidays/holidays.h>
 using namespace KHolidays;