cmake updates and finders

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bb6acfa..f7d1a49 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,29 +16,84 @@ SET(VERSION "${LIBZYPP_MAJOR}.${LIBZYPP_MINOR}.${LIBZYPP_PATCH}")
 
 ADD_DEFINITIONS( -DVERSION=\\\"${VERSION}\\\" )
 
+FIND_PACKAGE(Rpm REQUIRED)
 FIND_PACKAGE(Boost REQUIRED)
 FIND_PACKAGE(Gettext REQUIRED)
 FIND_PACKAGE(Hal REQUIRED)
 FIND_PACKAGE(Dbus REQUIRED)
 FIND_PACKAGE(Glib REQUIRED)
-
-IF (HAL_FOUND)
-  MESSAGE( STATUS "Hal found" )
-ELSE(HAL_FOUND)
-  MESSAGE( ERROR "Hal not found" )
-ENDIF(HAL_FOUND)
+FIND_PACKAGE(Curl REQUIRED)
+FIND_PACKAGE(Libxml REQUIRED)
+FIND_PACKAGE(Sqlite REQUIRED)
+FIND_PACKAGE(ZLIB REQUIRED)
+
+IF ( NOT RPM_FOUND)
+  MESSAGE( FATAL_ERROR " rpm not found" )
+ELSE ( NOT RPM_FOUND)
+  INCLUDE_DIRECTORIES(${RPM_INCLUDE_DIR})
+ENDIF( NOT RPM_FOUND)
+
+IF ( NOT ZLIB_FOUND)
+  MESSAGE( FATAL_ERROR " zlib not found" )
+ELSE ( NOT ZLIB_FOUND)
+  INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
+ENDIF( NOT ZLIB_FOUND)
+
+IF (GETTEXT_FOUND)
+  MESSAGE(STATUS "Found Gettext: ${GETTEXT_SOURCE}")
+  INCLUDE_DIRECTORIES(${GETTEXT_INCLUDE_DIR})
+ELSE (GETTEXT_FOUND)
+  MESSAGE( FATAL_ERROR "Gettext not found" )
+ENDIF (GETTEXT_FOUND)
+
+IF (Boost_FOUND)
+  MESSAGE( STATUS "boost found: includes in ${Boost_INCLUDE_DIRS}, library in ${Boost_LIBRARY_DIRS}")
+  INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
+  LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
+ENDIF(Boost_FOUND)
+
+IF ( NOT LIBXML_FOUND)
+  MESSAGE( FATAL_ERROR " libxml not found" )
+ELSE ( NOT LIBXML_FOUND)
+  INCLUDE_DIRECTORIES(${LIBXML_INCLUDE_DIR})
+ENDIF( NOT LIBXML_FOUND)
+
+IF ( NOT CURL_FOUND)
+  MESSAGE( FATAL_ERROR " curl not found" )
+ELSE ( NOT CURL_FOUND)
+  INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIR})
+ENDIF( NOT CURL_FOUND)
+
+IF ( NOT HAL_FOUND)
+  MESSAGE( FATAL_ERROR " Hal not found" )
+ELSE ( NOT HAL_FOUND)
+  INCLUDE_DIRECTORIES(${HAL_INCLUDE_DIR})
+# hal/libhal-storage.h is broken grrr 
+  INCLUDE_DIRECTORIES(${HAL_INCLUDE_DIR}/hal)
+ENDIF( NOT HAL_FOUND)
+
+IF ( NOT DBUS_FOUND)
+  MESSAGE( FATAL_ERROR " dbus not found" )
+ELSE ( NOT DBUS_FOUND)
+  INCLUDE_DIRECTORIES(${DBUS_INCLUDE_DIR})
+  INCLUDE_DIRECTORIES(${DBUS_ARCH_INCLUDE_DIR})
+ENDIF( NOT DBUS_FOUND)
 
 IF (GLIB_FOUND)
-  MESSAGE( STATUS "glib found" )
+  MESSAGE( STATUS "glib found: includes in ${GLIB_INCLUDE_DIR}, library in ${GLIB_LIBRARY}")
+  INCLUDE_DIRECTORIES(${GLIB_INCLUDE_DIR})
+  INCLUDE_DIRECTORIES(${GLIB_CONFIG_INCLUDE_DIR})
 ELSE(GLIB_FOUND)
-  MESSAGE( ERROR "glib not found" )
+  MESSAGE( FATAL_ERROR "glib not found" )
 ENDIF(GLIB_FOUND)
 
-IF (DBUS_GLIB_FOUND)
-  MESSAGE( STATUS "dbus-glib found" )
-ELSE(DBUS_GLIB_FOUND)
-  MESSAGE( ERROR "dbus-glib not found" )
-ENDIF(DBUS_GLIB_FOUND)
+#IF (DBUS_GLIB_FOUND)
+#  MESSAGE( STATUS "dbus-glib found" )
+#  INCLUDE_DIRECTORIES(${DBUS_GLIB_INCLUDE_DIR})
+#  LINK_DIRECTORIES(${DBUS_GLIB_LINK_DIR})
+#ELSE(DBUS_GLIB_FOUND)
+#  MESSAGE( ERROR "dbus-glib not found" )
+#ENDIF(DBUS_GLIB_FOUND)
 
 MESSAGE(STATUS "soname: ${LIBZYPP_CURRENT}.${LIBZYPP_PATCH}.${LIBZYPP_AGE}")
 MESSAGE(STATUS "version: ${VERSION}")
@@ -67,9 +122,11 @@ ENDMACRO(add_subdir_sources)
 ####################################################################
 
 ADD_SUBDIRECTORY( zypp ) 
-ADD_SUBDIRECTORY( zypp2 ) 
+ADD_SUBDIRECTORY( zypp2 )
+# do not build devel by default
+ADD_SUBDIRECTORY( devel EXCLUDE_FROM_ALL )
+ADD_SUBDIRECTORY( tools )
 #ADD_SUBDIRECTORY( examples ) 
-#ADD_SUBDIRECTORY( tools ) 
 #ADD_SUBDIRECTORY( testsuite ) 
 #ADD_SUBDIRECTORY( po ) 
 #ADD_SUBDIRECTORY( doc ) 

diff --git a/VERSION.cmake b/VERSION.cmake
index 11a28b5..368d970 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -44,7 +44,7 @@
 #    set COMPATMINOR to MINOR. (binary incompatible change)
 #
 
-SET(LIBZYPP_MAJOR "2")
-SET(LIBZYPP_MINOR "8")
-SET(LIBZYPP_COMPATMINOR "8")
-SET(LIBZYPP_PATCH "7")
+SET(LIBZYPP_MAJOR "3")
+SET(LIBZYPP_MINOR "0")
+SET(LIBZYPP_COMPATMINOR "0")
+SET(LIBZYPP_PATCH "0")

diff --git a/cmake/modules/FindCurl.cmake b/cmake/modules/FindCurl.cmake
new file mode 100644 (file)
index 0000000..8576ddb
--- /dev/null
+++ b/cmake/modules/FindCurl.cmake
@@ -0,0 +1,28 @@
+
+if(CURL_INCLUDE_DIR AND CURL_LIBRARY)
+       # Already in cache, be silent
+       set(CURL_FIND_QUIETLY TRUE)     
+endif(CURL_INCLUDE_DIR AND CURL_LIBRARY)
+
+set(CURL_LIBRARY)
+set(CURL_INCLUDE_DIR)
+
+FIND_PATH(CURL_INCLUDE_DIR curl/curl.h
+       /usr/include
+       /usr/local/include
+)
+
+FIND_LIBRARY(CURL_LIBRARY NAMES curl
+       PATHS
+       /usr/lib
+       /usr/local/lib
+)
+
+if(CURL_INCLUDE_DIR AND CURL_LIBRARY)
+   MESSAGE( STATUS "curl found: includes in ${CURL_INCLUDE_DIR}, library in ${CURL_LIBRARY}")
+   set(CURL_FOUND TRUE)
+else(CURL_INCLUDE_DIR AND CURL_LIBRARY)
+   MESSAGE( STATUS "curl not found")
+endif(CURL_INCLUDE_DIR AND CURL_LIBRARY)
+
+MARK_AS_ADVANCED(CURL_INCLUDE_DIR CURL_LIBRARY)
\ No newline at end of file

diff --git a/cmake/modules/FindDbus.cmake b/cmake/modules/FindDbus.cmake
index 4e26460..ca3ce2d 100644 (file)
--- a/cmake/modules/FindDbus.cmake
+++ b/cmake/modules/FindDbus.cmake
@@ -1,6 +1,35 @@
-INCLUDE( ${CMAKE_ROOT}/Modules/UsePkgConfig.cmake)
-PKGCONFIG("dbus-glib-1" DBUS_GLIB_INCLUDE_DIR DBUS_GLIB_LINK_DIR DBUS_GLIB_LINK_FLAGS DBUS_GLIB_CFLAGS)
 
-IF(DBUS_GLIB_CFLAGS)
-  SET(DBUS_GLIB_FOUND TRUE)
-ENDIF(DBUS_GLIB_CFLAGS)
\ No newline at end of file
+if(DBUS_INCLUDE_DIR AND DBUS_LIBRARY AND DBUS_ARCH_INCLUDE_DIR)
+       # Already in cache, be silent
+       set(DBUS_FIND_QUIETLY TRUE)     
+endif(DBUS_INCLUDE_DIR AND DBUS_LIBRARY AND DBUS_ARCH_INCLUDE_DIR)
+
+set(DBUS_LIBRARY)
+set(DBUS_INCLUDE_DIR)
+set(DBUS_ARCH_INCLUDE_DIR)
+
+FIND_PATH(DBUS_INCLUDE_DIR dbus/dbus.h
+       /usr/include
+       /usr/include/dbus-1.0
+       /usr/local/include
+)
+
+FIND_PATH(DBUS_ARCH_INCLUDE_DIR dbus/dbus-arch-deps.h
+       /usr/lib/include
+       /usr/lib/dbus-1.0/include
+)
+
+FIND_LIBRARY(DBUS_LIBRARY NAMES dbus dbus-1
+       PATHS
+       /usr/lib
+       /usr/local/lib
+)
+
+if(DBUS_INCLUDE_DIR AND DBUS_LIBRARY AND DBUS_ARCH_INCLUDE_DIR)
+   MESSAGE( STATUS "dbus found: includes in ${DBUS_INCLUDE_DIR}, library in ${DBUS_LIBRARY}")
+   set(DBUS_FOUND TRUE)
+else(DBUS_INCLUDE_DIR AND DBUS_LIBRARY AND DBUS_ARCH_INCLUDE_DIR)
+   MESSAGE( STATUS "dbus not found")
+endif(DBUS_INCLUDE_DIR AND DBUS_LIBRARY AND DBUS_ARCH_INCLUDE_DIR)
+
+MARK_AS_ADVANCED(DBUS_INCLUDE_DIR DBUS_LIBRARY DBUS_ARCH_INCLUDE_DIR)
\ No newline at end of file

diff --git a/cmake/modules/FindGlib.cmake b/cmake/modules/FindGlib.cmake
index 1eefb92..fa16d93 100644 (file)
--- a/cmake/modules/FindGlib.cmake
+++ b/cmake/modules/FindGlib.cmake
@@ -1,6 +1,37 @@
-INCLUDE( ${CMAKE_ROOT}/Modules/UsePkgConfig.cmake)
-PKGCONFIG("glib" GLIB_INCLUDE_DIR GLIB_LINK_DIR GLIB_LINK_FLAGS GLIB_CFLAGS)
 
-IF(GLIB_CFLAGS)
-  SET(GLIB_FOUND TRUE)
-ENDIF(GLIB_CFLAGS)
+if(GLIB_INCLUDE_DIR AND GLIB_LIBRARY AND GLIB_CONFIG_INCLUDE_DIR)
+       # Already in cache, be silent
+       set(GLIB_FIND_QUIETLY TRUE)     
+endif(GLIB_INCLUDE_DIR AND GLIB_LIBRARY AND GLIB_CONFIG_INCLUDE_DIR)
+
+set(GLIB_LIBRARY)
+set(GLIB_INCLUDE_DIR)
+set(GLIB_CONFIG_INCLUDE_DIR)
+
+FIND_PATH(GLIB_INCLUDE_DIR glib.h
+       /usr/include
+       /usr/include/glib-2.0
+       /opt/gnome/include/glib-2.0
+       /usr/local/include
+)
+
+FIND_PATH(GLIB_CONFIG_INCLUDE_DIR glibconfig.h
+  /opt/gnome/lib/glib-2.0/include
+  /usr/lib/glib-2.0/include
+)
+
+FIND_LIBRARY(GLIB_LIBRARY NAMES glib glib-2.0
+       PATHS
+       /usr/lib
+       /opt/gnome/lib
+       /usr/local/lib
+)
+
+if(GLIB_INCLUDE_DIR AND GLIB_LIBRARY AND GLIB_CONFIG_INCLUDE_DIR)
+   MESSAGE( STATUS "glib found: includes in ${GLIB_INCLUDE_DIR}, library in ${GLIB_LIBRARY}")
+   set(GLIB_FOUND TRUE)
+else(GLIB_INCLUDE_DIR AND GLIB_LIBRARY AND GLIB_CONFIG_INCLUDE_DIR)
+   MESSAGE( STATUS "glib not found")
+endif(GLIB_INCLUDE_DIR AND GLIB_LIBRARY AND GLIB_CONFIG_INCLUDE_DIR)
+
+MARK_AS_ADVANCED(GLIB_INCLUDE_DIR GLIB_LIBRARY GLIB_CONFIG_INCLUDE_DIR)
\ No newline at end of file

diff --git a/cmake/modules/FindHal.cmake b/cmake/modules/FindHal.cmake
index 521e7be..58c149a 100644 (file)
--- a/cmake/modules/FindHal.cmake
+++ b/cmake/modules/FindHal.cmake
@@ -1,2 +1,35 @@
-INCLUDE( ${CMAKE_ROOT}/Modules/UsePkgConfig.cmake)
-PKGCONFIG("hal" HAL_INCLUDE_DIR HAL_LINK_DIR HAL_LINK_FLAGS HAL_CFLAGS)
+
+if(HAL_INCLUDE_DIR AND HAL_LIBRARY AND HAL_STORAGE_LIBRARY)
+       # Already in cache, be silent
+       set(HAL_FIND_QUIETLY TRUE)      
+endif(HAL_INCLUDE_DIR AND HAL_LIBRARY AND HAL_STORAGE_LIBRARY)
+
+set(HAL_LIBRARY)
+set(HAL_INCLUDE_DIR)
+set(HAL_STORAGE_LIBRARY)
+
+FIND_PATH(HAL_INCLUDE_DIR hal/libhal.h
+       /usr/include
+       /usr/local/include
+)
+
+FIND_LIBRARY(HAL_LIBRARY NAMES hal
+       PATHS
+       /usr/lib
+       /usr/local/lib
+)
+
+FIND_LIBRARY(HAL_STORAGE_LIBRARY NAMES hal-storage
+       PATHS
+       /usr/lib
+       /usr/local/lib
+)
+
+if(HAL_INCLUDE_DIR AND HAL_LIBRARY AND HAL_STORAGE_LIBRARY)
+   MESSAGE( STATUS "hal found: includes in ${HAL_INCLUDE_DIR}, library in ${HAL_LIBRARY}")
+   set(HAL_FOUND TRUE)
+else(HAL_INCLUDE_DIR AND HAL_LIBRARY AND HAL_STORAGE_LIBRARY)
+   MESSAGE( STATUS "hal not found")
+endif(HAL_INCLUDE_DIR AND HAL_LIBRARY AND HAL_STORAGE_LIBRARY)
+
+MARK_AS_ADVANCED(HAL_INCLUDE_DIR HAL_LIBRARY HAL_STORAGE_LIBRARY)

diff --git a/cmake/modules/FindLibxml.cmake b/cmake/modules/FindLibxml.cmake
new file mode 100644 (file)
index 0000000..cb2ae2a
--- /dev/null
+++ b/cmake/modules/FindLibxml.cmake
@@ -0,0 +1,29 @@
+
+if(LIBXML_INCLUDE_DIR AND LIBXML_LIBRARY)
+       # Already in cache, be silent
+       set(LIBXML_FIND_QUIETLY TRUE)   
+endif(LIBXML_INCLUDE_DIR AND LIBXML_LIBRARY)
+
+set(LIBXML_LIBRARY)
+set(LIBXML_INCLUDE_DIR)
+
+FIND_PATH(LIBXML_INCLUDE_DIR libxml/parser.h
+       /usr/include
+       /usr/include/libxml2
+       /usr/local/include
+)
+
+FIND_LIBRARY(LIBXML_LIBRARY NAMES xml2
+       PATHS
+       /usr/lib
+       /usr/local/lib
+)
+
+if(LIBXML_INCLUDE_DIR AND LIBXML_LIBRARY)
+   MESSAGE( STATUS "libxml found: includes in ${LIBXML_INCLUDE_DIR}, library in ${LIBXML_LIBRARY}")
+   set(LIBXML_FOUND TRUE)
+else(LIBXML_INCLUDE_DIR AND LIBXML_LIBRARY)
+   MESSAGE( STATUS "libxml not found")
+endif(LIBXML_INCLUDE_DIR AND LIBXML_LIBRARY)
+
+MARK_AS_ADVANCED(LIBXML_INCLUDE_DIR LIBXML_LIBRARY)
\ No newline at end of file

diff --git a/cmake/modules/FindRpm.cmake b/cmake/modules/FindRpm.cmake
new file mode 100644 (file)
index 0000000..c49d405
--- /dev/null
+++ b/cmake/modules/FindRpm.cmake
@@ -0,0 +1,28 @@
+
+if(RPM_INCLUDE_DIR AND RPM_LIBRARY)
+       # Already in cache, be silent
+       set(RPM_FIND_QUIETLY TRUE)      
+endif(RPM_INCLUDE_DIR AND RPM_LIBRARY)
+
+set(RPM_LIBRARY)
+set(RPM_INCLUDE_DIR)
+
+FIND_PATH(RPM_INCLUDE_DIR rpm/misc.h
+       /usr/include
+       /usr/local/include
+)
+
+FIND_LIBRARY(RPM_LIBRARY NAMES rpm
+       PATHS
+       /usr/lib
+       /usr/local/lib
+)
+
+if(RPM_INCLUDE_DIR AND RPM_LIBRARY)
+   MESSAGE( STATUS "rpm found: includes in ${RPM_INCLUDE_DIR}, library in ${RPM_LIBRARY}")
+   set(RPM_FOUND TRUE)
+else(RPM_INCLUDE_DIR AND RPM_LIBRARY)
+   MESSAGE( STATUS "rpm not found")
+endif(RPM_INCLUDE_DIR AND RPM_LIBRARY)
+
+MARK_AS_ADVANCED(RPM_INCLUDE_DIR RPM_LIBRARY)
\ No newline at end of file

diff --git a/cmake/modules/FindSqlite.cmake b/cmake/modules/FindSqlite.cmake
new file mode 100644 (file)
index 0000000..af28dd5
--- /dev/null
+++ b/cmake/modules/FindSqlite.cmake
@@ -0,0 +1,28 @@
+
+if(SQLITE_INCLUDE_DIR AND SQLITE_LIBRARY)
+       # Already in cache, be silent
+       set(SQLITE_FIND_QUIETLY TRUE)   
+endif(SQLITE_INCLUDE_DIR AND SQLITE_LIBRARY)
+
+set(SQLITE_LIBRARY)
+set(SQLITE_INCLUDE_DIR)
+
+FIND_PATH(SQLITE_INCLUDE_DIR sqlite3.h
+       /usr/include
+       /usr/local/include
+)
+
+FIND_LIBRARY(SQLITE_LIBRARY NAMES sqlitezmd3 sqlite3
+       PATHS
+       /usr/lib
+       /usr/local/lib
+)
+
+if(SQLITE_INCLUDE_DIR AND SQLITE_LIBRARY)
+   MESSAGE( STATUS "sqlite found: includes in ${SQLITE_INCLUDE_DIR}, library in ${SQLITE_LIBRARY}")
+   set(SQLITE_FOUND TRUE)
+else(SQLITE_INCLUDE_DIR AND SQLITE_LIBRARY)
+   MESSAGE( STATUS "sqlite not found")
+endif(SQLITE_INCLUDE_DIR AND SQLITE_LIBRARY)
+
+MARK_AS_ADVANCED(SQLITE_INCLUDE_DIR SQLITE_LIBRARY)
\ No newline at end of file

diff --git a/devel/CMakeLists.txt b/devel/CMakeLists.txt
index fdecf4b..7e7ab20 100644 (file)
--- a/devel/CMakeLists.txt
+++ b/devel/CMakeLists.txt
@@ -1,99 +1,4 @@
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR}  )
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
 
-
-########### next target ###############
-
-SET(Example.createResolvable.bin_SRCS
-Example.createResolvable.cc
-)
-
-KDE3_AUTOMOC(${Example.createResolvable.bin_SRCS})
-
-KDE3_ADD_EXECUTABLE(Example.createResolvable.bin ${Example.createResolvable.bin_SRCS})
-
-TARGET_LINK_LIBRARIES(Example.createResolvable.bin  ${QT_AND_KDECORE_LIBS} )
-
-
-########### next target ###############
-
-SET(Example.createCapabilities.bin_SRCS
-Example.createCapabilities.cc
-)
-
-KDE3_AUTOMOC(${Example.createCapabilities.bin_SRCS})
-
-KDE3_ADD_EXECUTABLE(Example.createCapabilities.bin ${Example.createCapabilities.bin_SRCS})
-
-TARGET_LINK_LIBRARIES(Example.createCapabilities.bin  ${QT_AND_KDECORE_LIBS} )
-
-
-########### next target ###############
-
-SET(Example.COW_debug.bin_SRCS
-Example.COW_debug.cc
-)
-
-KDE3_AUTOMOC(${Example.COW_debug.bin_SRCS})
-
-KDE3_ADD_EXECUTABLE(Example.COW_debug.bin ${Example.COW_debug.bin_SRCS})
-
-TARGET_LINK_LIBRARIES(Example.COW_debug.bin  ${QT_AND_KDECORE_LIBS} )
-
-
-########### next target ###############
-
-SET(Example.EditionCompare.bin_SRCS
-Example.EditionCompare.cc
-)
-
-KDE3_AUTOMOC(${Example.EditionCompare.bin_SRCS})
-
-KDE3_ADD_EXECUTABLE(Example.EditionCompare.bin ${Example.EditionCompare.bin_SRCS})
-
-TARGET_LINK_LIBRARIES(Example.EditionCompare.bin  ${QT_AND_KDECORE_LIBS} )
-
-
-########### install files ###############
-
-
-
-
-#original Makefile.am contents follow:
-
-### Process this file with automake to produce Makefile.in
-### ##################################################
-#
-## Do NOT list devel.* in subdirs. It's developers playgound
-## and must not prevent anything from building.
-#
-#SUBDIRS =
-#
-### ##################################################
-#
-#noinst_PROGRAMS = \
-#      Example.createResolvable.bin    \
-#      Example.createCapabilities.bin  \
-#      Example.COW_debug.bin           \
-#      Example.EditionCompare.bin
-#
-### ##################################################
-#
-#LDADD =       $(top_srcdir)/zypp/lib@PACKAGE@.la
-#
-### ##################################################
-#
-#Example_createResolvable_bin_SOURCES  = Example.createResolvable.cc
-#Example_createCapabilities_bin_SOURCES        = Example.createCapabilities.cc
-#Example_COW_debug_bin_SOURCES                 = Example.COW_debug.cc
-#Example_EditionCompare_bin_SOURCES    = Example.EditionCompare.cc
-#
-### ##################################################
-#
-#.PHONY:        always
-#
-#$(noinst_PROGRAMS):    $(top_srcdir)/zypp/lib@PACKAGE@.la
-#
-#$(top_srcdir)/zypp/lib@PACKAGE@.la:     always
-#      $(MAKE) -C $(top_srcdir)/zypp
-#
-### ##################################################
+ADD_SUBDIRECTORY(devel.dmacvicar)
+ADD_SUBDIRECTORY(devel.ma)

diff --git a/devel/devel.dmacvicar/CMakeLists.txt b/devel/devel.dmacvicar/CMakeLists.txt
index 288d9c4..5b05dcb 100644 (file)
--- a/devel/devel.dmacvicar/CMakeLists.txt
+++ b/devel/devel.dmacvicar/CMakeLists.txt
@@ -1,4 +1,4 @@
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR}  )
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
 
 
 ########### next target ###############
@@ -7,12 +7,9 @@ SET(test_SRCS
 zypp-keyring.cc
 )
 
-KDE3_AUTOMOC(${test_SRCS})
-
-KDE3_ADD_EXECUTABLE(test ${test_SRCS})
-
-TARGET_LINK_LIBRARIES(test  ${QT_AND_KDECORE_LIBS} )
+ADD_EXECUTABLE(test ${test_SRCS})
 
+TARGET_LINK_LIBRARIES(test  zypp )
 
 ########### next target ###############
 
@@ -20,11 +17,8 @@ SET(lock_SRCS
 zypp-lock.cc
 )
 
-KDE3_AUTOMOC(${lock_SRCS})
-
-KDE3_ADD_EXECUTABLE(lock ${lock_SRCS})
-
-TARGET_LINK_LIBRARIES(lock  ${QT_AND_KDECORE_LIBS} )
+ADD_EXECUTABLE(lock ${lock_SRCS})
+TARGET_LINK_LIBRARIES(lock  zypp )
 
 
 ########### next target ###############
@@ -33,11 +27,8 @@ SET(testbed_SRCS
 testbed.cc
 )
 
-KDE3_AUTOMOC(${testbed_SRCS})
-
-KDE3_ADD_EXECUTABLE(testbed ${testbed_SRCS})
-
-TARGET_LINK_LIBRARIES(testbed  ${QT_AND_KDECORE_LIBS} )
+ADD_EXECUTABLE(testbed ${testbed_SRCS})
+TARGET_LINK_LIBRARIES(testbed  zypp )
 
 
 ########### next target ###############
@@ -46,11 +37,8 @@ SET(aj_SRCS
 aj.cc
 )
 
-KDE3_AUTOMOC(${aj_SRCS})
-
-KDE3_ADD_EXECUTABLE(aj ${aj_SRCS})
-
-TARGET_LINK_LIBRARIES(aj  ${QT_AND_KDECORE_LIBS} )
+ADD_EXECUTABLE(aj ${aj_SRCS})
+TARGET_LINK_LIBRARIES(aj  zypp )
 
 
 ########### next target ###############
@@ -59,11 +47,8 @@ SET(yumparser_SRCS
 yum-parser.cc
 )
 
-KDE3_AUTOMOC(${yumparser_SRCS})
-
-KDE3_ADD_EXECUTABLE(yumparser ${yumparser_SRCS})
-
-TARGET_LINK_LIBRARIES(yumparser  ${QT_AND_KDECORE_LIBS} )
+ADD_EXECUTABLE(yumparser ${yumparser_SRCS})
+TARGET_LINK_LIBRARIES(yumparser  zypp )
 
 
 ########### next target ###############
@@ -72,61 +57,6 @@ SET(media_SRCS
 media-glob.cc
 )
 
-KDE3_AUTOMOC(${media_SRCS})
-
-KDE3_ADD_EXECUTABLE(media ${media_SRCS})
-
-TARGET_LINK_LIBRARIES(media  ${QT_AND_KDECORE_LIBS} )
-
-
-########### install files ###############
-
-
-
-
-#original Makefile.am contents follow:
-
-### Process this file with automake to produce Makefile.in
-### ##################################################
-#
-#noinst_PROGRAMS = test lock testbed aj yumparser media
-#
-### ##################################################
-#
-#INCLUDES = -I$(oldincludedir)/libxml2
-#AM_LDFLAGS =
-#
-#AM_CXXFLAGS =
-## gperf:      -pg
-#
-#LDADD =               -L$(top_srcdir)/zypp/.libs -L$(top_srcdir)/zypp2/.libs -lzypp -lzypp2 -lboost_regex -lxml2 -lz $(top_srcdir)/testsuite/src/utils/lib@PACKAGE@_testsuite_utils.la
-#
-### ##################################################
-#
-#media_SOURCES = media-glob.cc
-#media_LDFLAGS =       -static
-#
-#test_SOURCES =        zypp-keyring.cc
-#test_LDFLAGS =        -static
-#
-#lock_SOURCES =        zypp-lock.cc
-#lock_LDFLAGS =        -static
-#
-#testbed_SOURCES = testbed.cc
-#testbed_LDFLAGS = -static
-#
-#aj_SOURCES =  aj.cc
-#aj_LDFLAGS =  -static
-#
-#yumparser_SOURCES =   yum-parser.cc
-#yumparser_LDFLAGS =   -static
-##yumparser_LDADD = 
-#
-#.PHONY:        always
-#
-#$(noinst_PROGRAMS):    $(top_srcdir)/zypp/lib@PACKAGE@.la $(top_srcdir)/zypp2/lib@PACKAGE@2.la
-#
-#$(top_srcdir)/zypp/lib@PACKAGE@.la:     always
-#      $(MAKE) -C $(top_srcdir)/zypp
-#
-### ##################################################
+ADD_EXECUTABLE(media ${media_SRCS})
+TARGET_LINK_LIBRARIES(media  zypp )
+

diff --git a/devel/devel.ma/CMakeLists.txt b/devel/devel.ma/CMakeLists.txt
index 2adfb53..3a31ce2 100644 (file)
--- a/devel/devel.ma/CMakeLists.txt
+++ b/devel/devel.ma/CMakeLists.txt
@@ -1,96 +1,14 @@
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR}  )
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
 
 
 ########### next target ###############
 
-SET(AOUT_SRCS
-AOUT.cc
-$(ADD_SOURCES)
-)
+#SET(AOUT_SRCS
+#AOUT.cc
+#$(ADD_SOURCES)
+#)
 
-KDE3_AUTOMOC(${AOUT_SRCS})
+#ADD_EXECUTABLE(AOUT ${AOUT_SRCS})
+#TARGET_LINK_LIBRARIES(AOUT  zypp )
 
-KDE3_ADD_EXECUTABLE(AOUT ${AOUT_SRCS})
 
-TARGET_LINK_LIBRARIES(AOUT  ${QT_AND_KDECORE_LIBS} )
-
-
-########### next target ###############
-
-SET(Prof_SRCS
-Prof.cc
-)
-
-KDE3_AUTOMOC(${Prof_SRCS})
-
-KDE3_ADD_EXECUTABLE(Prof ${Prof_SRCS})
-
-TARGET_LINK_LIBRARIES(Prof  ${QT_AND_KDECORE_LIBS} boost_regex boost_filesystem curl idn blkid uuid xml2 rpm util )
-
-
-########### install files ###############
-
-
-
-
-#original Makefile.am contents follow:
-
-### Process this file with automake to produce Makefile.in
-### ##################################################
-#
-#noinst_PROGRAMS = AOUT Prof
-#
-### ##################################################
-#
-#INCLUDES =
-#
-#AM_LDFLAGS =
-#
-#AM_CXXFLAGS = -pg
-#
-#LDADD =               -L$(top_srcdir)/zypp/.libs -lzypp -lboost_regex
-#
-### ##################################################
-#
-#ADD_SOURCES =         xml/Node.cc             xml/Node.h      \
-#              xml/Reader.cc           xml/Reader.h    \
-#              xml/XmlString.cc        xml/XmlString.h \
-#              xml/libxmlfwd.cc        xml/libxmlfwd.h
-#
-### ##################################################
-#
-#AOUT_SOURCES = AOUT.cc $(ADD_SOURCES)
-#AOUT_LDFLAGS = -static
-#
-### ##################################################
-#
-#%: %.cc $(top_srcdir)/zypp/lib@PACKAGE@.la
-#      touch .deps/$@.Po
-#      ln -sf $@.Po .deps/AOUT.Po
-#      ln -sf $@.cc AOUT.cc
-#      ln -sf $@.o  AOUT.o
-#      $(MAKE) AOUT
-#      mv AOUT $@
-#
-### ##################################################
-#
-#PROF_OBJ =    $(strip $(shell find $(top_srcdir)/zypp -name '*.o' | grep -v 'LogControl.o') ) \
-#              $(top_srcdir)/zypp/base/.libs/LogControl.o
-#
-#Prof_SOURCES = Prof.cc
-#Prof_LDADD   = -lboost_regex -lboost_filesystem -lcurl -lidn -lblkid -luuid -lxml2 -lrpm -lutil
-#Prof_LDFLAGS = $(PROF_OBJ)
-#
-### ##################################################
-#
-#.PHONY:               always
-#
-#Tools.h:      $(top_srcdir)/zypp/lib@PACKAGE@.la
-#
-#$(top_srcdir)/zypp/lib@PACKAGE@.la:     always
-#      $(MAKE) -C $(top_srcdir)/zypp
-#
-#xtp:
-#      echo $(PROF_OBJ)
-#
-### ##################################################

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 4b15ea8..29b6b91 100644 (file)
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -1,14 +1,2 @@
 ADD_SUBDIRECTORY( registration ) 
 ADD_SUBDIRECTORY( package-manager ) 
-
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR}  )
-
-
-########### install files ###############
-
-
-
-
-#original Makefile.am contents follow:
-
-#SUBDIRS = registration package-manager

diff --git a/tools/package-manager/CMakeLists.txt b/tools/package-manager/CMakeLists.txt
index e69fe15..ae4e9e4 100644 (file)
--- a/tools/package-manager/CMakeLists.txt
+++ b/tools/package-manager/CMakeLists.txt
@@ -1,4 +1,4 @@
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR}  )
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
 
 
 ########### install files ###############
@@ -6,17 +6,3 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${K
 INSTALL_FILES( /share/pixmaps FILES  package-manager-icon.png )
 INSTALL_FILES(  FILES  package-manager )
 INSTALL_FILES( /share/applications FILES  package-manager.desktop )
-
-
-
-#original Makefile.am contents follow:
-
-#dist_bin_SCRIPTS = package-manager
-#
-#icondir = $(datadir)/pixmaps
-#icon_DATA = package-manager-icon.png
-#
-#desktopdir = $(datadir)/applications
-#desktop_DATA = package-manager.desktop
-#
-#EXTRA_DIST = $(icon_DATA) $(desktop_DATA)

diff --git a/tools/registration/CMakeLists.txt b/tools/registration/CMakeLists.txt
index bdb2fa5..9e87936 100644 (file)
--- a/tools/registration/CMakeLists.txt
+++ b/tools/registration/CMakeLists.txt
@@ -1,44 +1,8 @@
-INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/tools/registration ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR}  )
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
 
+SET( querypool_SRC
+zypp-query-pool.cc
+)
 
-########### install files ###############
-
-
-
-
-#original Makefile.am contents follow:
-
-### Process this file with automake to produce Makefile.in
-### ##################################################
-#
-#libexecdir=$(exec_prefix)/lib/@PACKAGE@
-#
-#libexec_PROGRAMS = zypp-query-pool
-#
-##bindir = $(libexecdir)/zypp
-##bin_PROGRAMS = zypp-query-pool
-#
-### ##################################################
-#
-#INCLUDES = -I$(top_srcdir)/tools/registration -I$(oldincludedir)/libxml2
-#AM_LDFLAGS =
-#
-#AM_CXXFLAGS =
-## gperf:      -pg
-#
-#LDADD =               -L$(top_srcdir)/zypp/.libs -lzypp
-#
-### ##################################################
-#
-#zypp_query_pool_SOURCES =     zypp-query-pool.cc keyring-callbacks.h
-#
-##zmart_LDFLAGS =      -static
-#
-#.PHONY:        always
-#
-##$(noinst_PROGRAMS):    $(top_srcdir)/zypp/lib@PACKAGE@.la
-#
-#$(top_srcdir)/zypp/lib@PACKAGE@.la:     always
-#      $(MAKE) -C $(top_srcdir)/zypp
-#
-### ##################################################
+ADD_EXECUTABLE( querypool ${querypool_SRC} )
+TARGET_LINK_LIBRARIES( querypool zypp )

diff --git a/zypp/CMakeLists.txt b/zypp/CMakeLists.txt
index 4fa86d4..9fc5f05 100644 (file)
--- a/zypp/CMakeLists.txt
+++ b/zypp/CMakeLists.txt
@@ -109,7 +109,21 @@ ADD_SUBDIRECTORY( ui )
 #MESSAGE( STATUS ${zypp_SRCS} )
 
 ADD_LIBRARY(zypp SHARED ${zypp_SRCS})
-TARGET_LINK_LIBRARIES(zypp boost_filesystem util )
+
+# System libraries
+TARGET_LINK_LIBRARIES(zypp boost_filesystem boost_regex util )
+TARGET_LINK_LIBRARIES(zypp ${DBUS_LIBRARY} )
+TARGET_LINK_LIBRARIES(zypp dbus-glib-1 )
+TARGET_LINK_LIBRARIES(zypp ${GLIB_LIBRARY} )
+TARGET_LINK_LIBRARIES(zypp ${RPM_LIBRARY} )
+TARGET_LINK_LIBRARIES(zypp ${GETTEXT_LIBRARIES} )
+TARGET_LINK_LIBRARIES(zypp ${HAL_LIBRARY} )
+TARGET_LINK_LIBRARIES(zypp ${HAL_STORAGE_LIBRARY} )
+TARGET_LINK_LIBRARIES(zypp ${CURL_LIBRARY} )
+TARGET_LINK_LIBRARIES(zypp ${LIBXML_LIBRARY} )
+TARGET_LINK_LIBRARIES(zypp ${SQLITE_LIBRARY} )
+TARGET_LINK_LIBRARIES(zypp ${ZLIB_LIBRARY} )
+# subdirectory static libraries
 TARGET_LINK_LIBRARIES(zypp zypp_base)
 TARGET_LINK_LIBRARIES(zypp zypp_thread)
 TARGET_LINK_LIBRARIES(zypp zypp_url)

diff --git a/zypp/parser/CMakeLists.txt b/zypp/parser/CMakeLists.txt
index 7fb9002..10425fd 100644 (file)
--- a/zypp/parser/CMakeLists.txt
+++ b/zypp/parser/CMakeLists.txt
@@ -3,7 +3,7 @@ ADD_SUBDIRECTORY( yum )
 ADD_SUBDIRECTORY( tagfile ) 
 ADD_SUBDIRECTORY( xmlstore ) 
 
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR}  )
+INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
 SET(zypp_parser_SRCS
 XMLNodeIterator.cc