Author: dmacvicar Date: Tue Jul 17 11:53:28 2007 New Revision: 6041 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6041&view=rev Log: Require the right kdepim3 and kdelibs3 and detect it to build Modified: trunk/updater-kde/CMakeLists.txt trunk/updater-kde/opensuse-updater-kde.spec.in trunk/updater-kde/updater/CMakeLists.txt Modified: trunk/updater-kde/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/CMakeLists.txt?rev=6041&r1=6040&r2=6041&view=diff ============================================================================== --- trunk/updater-kde/CMakeLists.txt (original) +++ trunk/updater-kde/CMakeLists.txt Tue Jul 17 11:53:28 2007 @@ -32,6 +32,7 @@ # dont et cmake detect Qt4 uic as Qt3 uic: SET(ENV{QTDIR} /usr/lib/qt3) FIND_PACKAGE(KDE3 REQUIRED) +FIND_PACKAGE(KDE3Pim REQUIRED) FIND_PACKAGE(Gettext REQUIRED) # Library Modified: trunk/updater-kde/opensuse-updater-kde.spec.in URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/opensuse-updater-kde.spec.in?rev=6041&r1=6040&r2=6041&view=diff ============================================================================== --- trunk/updater-kde/opensuse-updater-kde.spec.in (original) +++ trunk/updater-kde/opensuse-updater-kde.spec.in Tue Jul 17 11:53:28 2007 @@ -9,7 +9,8 @@ # Name: @PACKAGE@ -BuildRequires: kdelibs3-devel update-desktop-files +BuildRequires: kdelibs3-devel >= 3.5.7 +BuildRequires kdepim3-devel update-desktop-files License: GPL Group: System/Management Summary: KDE updater applet for OpenSUSE Modified: trunk/updater-kde/updater/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/CMakeLists.txt?rev=6041&r1=6040&r2=6041&view=diff ============================================================================== --- trunk/updater-kde/updater/CMakeLists.txt (original) +++ trunk/updater-kde/updater/CMakeLists.txt Tue Jul 17 11:53:28 2007 @@ -3,7 +3,7 @@ ADD_SUBDIRECTORY( dummy ) ADD_SUBDIRECTORY( dummy_with_packages ) -INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/kxmlrpcclient ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR} ) +INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/kxmlrpcclient ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR} ${KDEPIM3_CONNECTION_INCLUDE_DIR} ) ########### next target ############### @@ -15,10 +15,9 @@ KDE3_AUTOMOC(${opensuseupdater_LIB_SRCS}) ADD_LIBRARY(opensuseupdater SHARED ${opensuseupdater_LIB_SRCS}) SET_TARGET_PROPERTIES(opensuseupdater PROPERTIES VERSION 4.2.0 SOVERSION 4 ) -TARGET_LINK_LIBRARIES(opensuseupdater ${QT_AND_KDECORE_LIBS} kdeui connectionmanager ) +TARGET_LINK_LIBRARIES(opensuseupdater ${QT_AND_KDECORE_LIBS} kdeui ${KDEPIM3_CONNECTION_LIBRARY} ) INSTALL(TARGETS opensuseupdater DESTINATION ${KDE3_LIB_INSTALL_DIR} ) - ########### next target ############### SET(opensuseupdater_SRCS progresspopup.cpp progresspopup.h main.cpp UpdaterApplication.cpp MainWindow.cpp ConfigWidget.h ConfigWidgetUI.h ConfigWidgetUI.ui ) -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org