now the FindQPackageKit works, but now we have a link error..

9 files changed, 28 insertions, 21 deletions

diff --git a/gui/AddRm/CMakeLists.txt b/gui/AddRm/CMakeLists.txt
index 9a61149..cb4931a 100644
--- a/gui/AddRm/CMakeLists.txt
+++ b/gui/AddRm/CMakeLists.txt
@@ -17,6 +17,6 @@ kde4_add_ui_files(kpk_addrm_SRCS
 )
 
 kde4_add_plugin(kcm_kpk_addrm ${kpk_addrm_SRCS})
-target_link_libraries(kcm_kpk_addrm ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KNEWSTUFF2_LIBS} ${QPACKAGEKIT_LIBS} )
+target_link_libraries(kcm_kpk_addrm ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KNEWSTUFF2_LIBS} ${QPACKAGEKIT_LIB} )
 
 install(TARGETS kcm_kpk_addrm  DESTINATION ${PLUGIN_INSTALL_DIR} )
\ No newline at end of file
diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
index 74b42de..9a41985 100644
--- a/gui/CMakeLists.txt
+++ b/gui/CMakeLists.txt
@@ -3,10 +3,9 @@ cmake_minimum_required(VERSION 2.4.8)
 project(KPackageKit)
 
 find_package(KDE4 REQUIRED)
+find_package(QPackageKit REQUIRED)
 include(KDE4Defaults)
-# TODO fix link_directories
-## ${CMAKE_BINARY_DIR}
-link_directories( packagekit-qt )
+
 add_definitions(${QT_DEFINITIONS} ${KDE_DEFINITIONS})
 include_directories( ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${KDE4_KIO_INCLUDES} ${QPACKAGEKIT_INCLUDE_DIR} )
 
diff --git a/gui/Common/PkStrings.h b/gui/Common/PkStrings.h
index b05f2ef..45651f9 100755
--- a/gui/Common/PkStrings.h
+++ b/gui/Common/PkStrings.h
@@ -24,7 +24,7 @@
 #include <QObject>
 #include <KIcon>
 
-#include "../../lib/QPackageKit.h"
+#include <QPackageKit>
 
 using namespace PackageKit;
 
diff --git a/gui/Updater/PkAddRm_Model.h b/gui/Updater/PkAddRm_Model.h
index 179ef75..02d467f 100644
--- a/gui/Updater/PkAddRm_Model.h
+++ b/gui/Updater/PkAddRm_Model.h
@@ -5,7 +5,7 @@
 #include <KIcon>
 
 #include "pkg_item.h"
-#include "../../lib/QPackageKit.h"
+#include <QPackageKit>
 
 using namespace PackageKit;
 
diff --git a/gui/Updater/PkUpdate.h b/gui/Updater/PkUpdate.h
index 8186da6..c001443 100755
--- a/gui/Updater/PkUpdate.h
+++ b/gui/Updater/PkUpdate.h
@@ -24,7 +24,7 @@
 #include "PkAddRm_Model.h"
 #include "PkAddRm_Delegate.h"
 #include "ui_PkUpdate.h"
-#include "../../lib/QPackageKit.h"
+#include <QPackageKit>
 
 using namespace PackageKit;
  
diff --git a/gui/Updater/pkg_item.h b/gui/Updater/pkg_item.h
index e752022..8b3ff2e 100644
--- a/gui/Updater/pkg_item.h
+++ b/gui/Updater/pkg_item.h
@@ -20,7 +20,7 @@
 #ifndef PACKAGE_ITEM_H
 #define PACKAGE_ITEM_H
 
-#include "../../lib/QPackageKit.h"
+#include <QPackageKit>
 
 #include <QList>
 #include <QVariant>
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index d3af79e..625d122 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -1,3 +1,5 @@
+cmake_minimum_required(VERSION 2.4.8)
+
 project(packagekit-qt)
 
 if(${CMAKE_SIZEOF_VOID_P} EQUAL 8)
@@ -7,6 +9,7 @@ ELSE(${CMAKE_SIZEOF_VOID_P} EQUAL 8)
 ENDIF(${CMAKE_SIZEOF_VOID_P} EQUAL 8)
 
 find_package(Qt4 REQUIRED)
+add_definitions(${QT_DEFINITIONS})
 
 include(FindPkgConfig)
 pkg_check_modules(POLICYKIT polkit-dbus)
@@ -39,12 +42,16 @@ install(TARGETS
 	)
 
 install(FILES
+        CentralProxy.h
+	TransactionProxy.h
 	Daemon.h
 	Transaction.h
+	Package.h
 	Exit.h
 	Actions.h
 	Error.h
 	Exit.h
+	Enum.h
 	Provides.h
 	Restart.h
 	Role.h
diff --git a/lib/modules/CMakeLists.txt b/lib/modules/CMakeLists.txt
index 1f8b0a2..288c628 100644
--- a/lib/modules/CMakeLists.txt
+++ b/lib/modules/CMakeLists.txt
@@ -1,9 +1,9 @@
  
 ## install the cmake files
 
-file(GLOB cmakeFiles "${CMAKE_CURRENT_SOURCE_DIR}/*.cmake")
+file( GLOB cmakeFiles FindQPackageKit.cmake )
 # FIXME remove safely /usr/share
-set(module_install_dir ${DATA_INSTALL_DIR}/usr/share/cmake/modules )
+set(module_install_dir /usr/share/cmake-2.6/Modules )
 
 install( FILES ${cmakeFiles} 
          DESTINATION ${module_install_dir}  )
diff --git a/lib/modules/FindQPackageKit.cmake b/lib/modules/FindQPackageKit.cmake
index f5d3e29..44a448d 100644
--- a/lib/modules/FindQPackageKit.cmake
+++ b/lib/modules/FindQPackageKit.cmake
@@ -3,7 +3,7 @@
 #
 #  QPACKAGEKIT_FOUND - system has QPackageKit
 #  QPACKAGEKIT_INCLUDE_DIR - the QPackageKit include directory
-#  QPACKAGEKIT_LIBS - Link these to use QPackageKit
+#  QPACKAGEKIT_LIB - Link these to use QPackageKit
 #  QPACKAGEKIT_DEFINITIONS - Compiler switches required for using QPackageKit
 
 # Copyright (c) 2008, Adrien Bustany, <madcat@mymadcat.com>
@@ -11,24 +11,25 @@
 # Redistribution and use is allowed according to the terms of the GPLv3+ license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
-IF (QPACKAGEKIT_INCLUDE_DIR AND QPACKAGEKIT_LIBS)
+IF (QPACKAGEKIT_INCLUDE_DIR AND QPACKAGEKIT_LIB)
     SET(QPACKAGEKIT_FIND_QUIETLY TRUE)
-ENDIF (QPACKAGEKIT_INCLUDE_DIR AND QPACKAGEKIT_LIBS)
+ENDIF (QPACKAGEKIT_INCLUDE_DIR AND QPACKAGEKIT_LIB)
 
-FIND_PATH(QPACKAGEKIT_INCLUDE_DIR QPackageKit)
-FIND_LIBRARY(QPACKAGEKIT_LIBS NAMES packagekit-qt)
+FIND_PATH( QPACKAGEKIT_INCLUDE_DIR packagekit-qt/QPackageKit )
 
-IF (QPACKAGEKIT_INCLUDE_DIR AND QPACKAGEKIT_LIBS)
+FIND_LIBRARY( QPACKAGEKIT_LIB NAMES packagekit-qt )
+
+IF (QPACKAGEKIT_INCLUDE_DIR AND QPACKAGEKIT_LIB)
    SET(QPACKAGEKIT_FOUND TRUE)
-ELSE (QPACKAGEKIT_INCLUDE_DIR AND QPACKAGEKIT_LIBS)
+ELSE (QPACKAGEKIT_INCLUDE_DIR AND QPACKAGEKIT_LIB)
    SET(QPACKAGEKIT_FOUND FALSE)
-ENDIF (QPACKAGEKIT_INCLUDE_DIR AND QPACKAGEKIT_LIBS)
+ENDIF (QPACKAGEKIT_INCLUDE_DIR AND QPACKAGEKIT_LIB)
 
-SET(QPACKAGEKIT_INCLUDE_DIR QPACKAGEKIT_INCLUDE_DIR/packagekit-qt)
+SET(QPACKAGEKIT_INCLUDE_DIR ${QPACKAGEKIT_INCLUDE_DIR}/packagekit-qt)
 
 IF (QPACKAGEKIT_FOUND)
   IF (NOT QPACKAGEKIT_FIND_QUIETLY)
-    MESSAGE(STATUS "Found QPackageKit: ${QPACKAGEKIT_INCLUDE_DIR}")
+    MESSAGE(STATUS "Found QPackageKit: ${QPACKAGEKIT_LIB}")
   ENDIF (NOT QPACKAGEKIT_FIND_QUIETLY)
 ELSE (QPACKAGEKIT_FOUND)
   IF (QPACKAGEKIT_FIND_REQUIRED)
@@ -36,5 +37,5 @@ ELSE (QPACKAGEKIT_FOUND)
   ENDIF (QPACKAGEKIT_FIND_REQUIRED)
 ENDIF (QPACKAGEKIT_FOUND)
 
-MARK_AS_ADVANCED(QPACKAGEKIT_INCLUDE_DIR QPACKAGEKIT_LIBS)
+MARK_AS_ADVANCED(QPACKAGEKIT_INCLUDE_DIR QPACKAGEKIT_LIB)