cmake fixes

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f7d1a49c35abe376bca97f53e09dc85f89722328..a70cbbfcf92b00f99cf86bd705944ba537e6bb8b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -127,7 +127,7 @@ ADD_SUBDIRECTORY( zypp2 )
 ADD_SUBDIRECTORY( devel EXCLUDE_FROM_ALL )
 ADD_SUBDIRECTORY( tools )
 #ADD_SUBDIRECTORY( examples ) 
-#ADD_SUBDIRECTORY( testsuite ) 
+ADD_SUBDIRECTORY( testsuite ) 
 #ADD_SUBDIRECTORY( po ) 
 #ADD_SUBDIRECTORY( doc ) 
 

diff --git a/testsuite/CMakeLists.txt b/testsuite/CMakeLists.txt
index 37324fc174d3a876b7e943de9dce898f6f484cfe..fb4e314ebcbb16d72881ecc413354d62c3bb2811 100644 (file)
--- a/testsuite/CMakeLists.txt
+++ b/testsuite/CMakeLists.txt
@@ -1,23 +1,10 @@
-ADD_SUBDIRECTORY( src ) 
-ADD_SUBDIRECTORY( zypp ) 
-ADD_SUBDIRECTORY( cache ) 
-ADD_SUBDIRECTORY( target ) 
-ADD_SUBDIRECTORY( solver ) 
-ADD_SUBDIRECTORY( source ) 
-ADD_SUBDIRECTORY( media ) 
-ADD_SUBDIRECTORY( parser ) 
-
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR}  )
-
-
-########### install files ###############
-
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
 
-
-
-#original Makefile.am contents follow:
-
-##
-## Makefile.am for libzypp/testsuite
-##
-#SUBDIRS = src zypp cache target solver source media parser
+#ADD_SUBDIRECTORY( src ) 
+#ADD_SUBDIRECTORY( zypp ) 
+ADD_SUBDIRECTORY( cache ) 
+#ADD_SUBDIRECTORY( target ) 
+#ADD_SUBDIRECTORY( solver ) 
+#ADD_SUBDIRECTORY( source ) 
+#ADD_SUBDIRECTORY( media ) 
+#ADD_SUBDIRECTORY( parser ) 

diff --git a/testsuite/cache/CMakeLists.txt b/testsuite/cache/CMakeLists.txt
index 3a6f49c7260721463ea1c4403418017abdd1bc43..a5a20225ba288756de0e00d577bb619d8b7ed824 100644 (file)
--- a/testsuite/cache/CMakeLists.txt
+++ b/testsuite/cache/CMakeLists.txt
@@ -1,58 +1,10 @@
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR}  )
-
-
-########### next target ###############
+INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
 
 SET(SourceCacheInitializer_SRCS
 SourceCacheInitializer.cc
 )
 
-KDE3_AUTOMOC(${SourceCacheInitializer_SRCS})
-
-IF(KDE3_BUILD_TESTS)
-
-KDE3_ADD_EXECUTABLE(SourceCacheInitializer ${SourceCacheInitializer_SRCS})
-
-TARGET_LINK_LIBRARIES(SourceCacheInitializer  ${QT_AND_KDECORE_LIBS} boost_unit_test_framework )
-
-ENDIF(KDE3_BUILD_TESTS)
-
-########### 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 =
-#
-### ##################################################
-#
-#TESTS = SourceCacheInitializer
-#
-#check_PROGRAMS = SourceCacheInitializer
-#
-### ##################################################
-#
-#LDADD =       $(top_srcdir)/zypp/lib@PACKAGE@.la $(top_srcdir)/zypp2/lib@PACKAGE@2.la
-#
-### ##################################################
-#
-#SourceCacheInitializer_SOURCES = SourceCacheInitializer.cc
-#SourceCacheInitializer_LDADD = $(LDADD) -lboost_unit_test_framework
-#
-### ##################################################
-#
-#.PHONY:        always
-#
-#$(noinst_PROGRAMS):    $(top_srcdir)/zypp/lib@PACKAGE@.la
-#
-##$(top_srcdir)/zypp/lib@PACKAGE@.la:     always
-##     $(MAKE) -C $(top_srcdir)/zypp
-#
-### ##################################################
+ADD_EXECUTABLE(SourceCacheInitializer ${SourceCacheInitializer_SRCS})
+TARGET_LINK_LIBRARIES(SourceCacheInitializer boost_unit_test_framework )
+TARGET_LINK_LIBRARIES(SourceCacheInitializer zypp2 )
+TARGET_LINK_LIBRARIES(SourceCacheInitializer zypp )

diff --git a/testsuite/zypp/CMakeLists.txt b/testsuite/zypp/CMakeLists.txt
index de0b0ea6a5709e4b1403136227f8c8e256b5e2c8..38fa052b152c363c08c152f1305b88cc471133bc 100644 (file)
--- a/testsuite/zypp/CMakeLists.txt
+++ b/testsuite/zypp/CMakeLists.txt
@@ -211,17 +211,17 @@ ENDIF(KDE3_BUILD_TESTS)
 
 ########### next target ###############
 
-SET(LazzyText_SRCS
-LazzyText.cc
+SET(Lazy_SRCS
+Lazy.cc
 )
 
-KDE3_AUTOMOC(${LazzyText_SRCS})
+KDE3_AUTOMOC(${Lazy_SRCS})
 
 IF(KDE3_BUILD_TESTS)
 
-KDE3_ADD_EXECUTABLE(LazzyText ${LazzyText_SRCS})
+KDE3_ADD_EXECUTABLE(Lazy ${Lazy_SRCS})
 
-TARGET_LINK_LIBRARIES(LazzyText  ${QT_AND_KDECORE_LIBS} boost_unit_test_framework )
+TARGET_LINK_LIBRARIES(Lazy  ${QT_AND_KDECORE_LIBS} boost_unit_test_framework )
 
 ENDIF(KDE3_BUILD_TESTS)
 
@@ -253,7 +253,7 @@ ENDIF(KDE3_BUILD_TESTS)
 #      Digest \
 #      Signature \
 #      KeyRing \
-#      LazzyText
+#      Lazy
 #
 #check_PROGRAMS = Arch Url \
 #      RWPtr \
@@ -267,7 +267,7 @@ ENDIF(KDE3_BUILD_TESTS)
 #      Digest \
 #      Signature \
 #      KeyRing \
-#      LazzyText
+#      Lazy
 #
 ### ##################################################
 #
@@ -311,8 +311,8 @@ ENDIF(KDE3_BUILD_TESTS)
 #KeyRing_SOURCES = KeyRing.cc
 #KeyRing_LDADD  = $(LDADD) -lboost_unit_test_framework
 #
-#LazzyText_SOURCES = LazzyText.cc
-#LazzyText_LDADD  = $(LDADD) $(top_srcdir)/zypp2/lib@PACKAGE@2.la  -lboost_unit_test_framework
+#Lazy_SOURCES = Lazy.cc
+#Lazy_LDADD  = $(LDADD) $(top_srcdir)/zypp2/lib@PACKAGE@2.la  -lboost_unit_test_framework
 #
 ### ##################################################
 #

diff --git a/tools/registration/CMakeLists.txt b/tools/registration/CMakeLists.txt
index 9e87936abe6f47fedcc1c991ff608910b19935ec..08994d68103d2eb92e6fd5197447270428d94cad 100644 (file)
--- a/tools/registration/CMakeLists.txt
+++ b/tools/registration/CMakeLists.txt
@@ -4,5 +4,6 @@ SET( querypool_SRC
 zypp-query-pool.cc
 )
 
-ADD_EXECUTABLE( querypool ${querypool_SRC} )
-TARGET_LINK_LIBRARIES( querypool zypp )
+ADD_EXECUTABLE( zypp-querypool ${querypool_SRC} )
+TARGET_LINK_LIBRARIES( zypp-querypool zypp )
+TARGET_LINK_LIBRARIES( zypp-querypool xml2 )
\ No newline at end of file

diff --git a/zypp/target/CMakeLists.txt b/zypp/target/CMakeLists.txt
index 92d8951f7ea28bb5515e6891b3d6c34b5e2aafc4..a8698c1dc8b18a79a50281a774b9042278442080 100644 (file)
--- a/zypp/target/CMakeLists.txt
+++ b/zypp/target/CMakeLists.txt
@@ -10,6 +10,9 @@ TargetImpl.cc
 TargetCallbackReceiver.cc
 TargetException.cc
 CommitLog.cc
+CommitPackageCache.cc
+CommitPackageCacheImpl.cc
+CommitPackageCacheReadAhead.cc
 )
 
 ADD_LIBRARY(zypp_target STATIC ${zypp_target_SRCS})
@@ -25,6 +28,8 @@ CommitLog.h
 TargetCallbackReceiver.h
 TargetException.h
 TargetImpl.h
+CommitPackageCache.h
+CommitPackageCacheReadAhead.h
 DESTINATION
 ${CMAKE_INSTALL_PREFIX}/include/zypp/target
 )

diff --git a/zypp2/CMakeLists.txt b/zypp2/CMakeLists.txt
index a0b6cbe5d80c35c1ec4ddada35e29feef96290a2..bd191f401eb33d98e163f4d269d2d85356b5ecf7 100644 (file)
--- a/zypp2/CMakeLists.txt
+++ b/zypp2/CMakeLists.txt
@@ -4,7 +4,7 @@ ADD_SUBDIRECTORY( source )
 INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
 
 SET(zypp2_SRCS
-LazzyText.cc
+Lazy.cc
 )
 
 SET_SOURCE_FILES_PROPERTIES(${zypp2_SRCS} PROPERTIES COMPILE_FLAGS -DZYPP_BASE_LOGGER_LOGGROUP=\\\"zypp\\\")