- Install a sample /etc/zypp.conf. (#306615)
[platform/upstream/libzypp.git] / zypp / CMakeLists.txt
index a3dd981..48e4b32 100644 (file)
@@ -1,89 +1,97 @@
 ####################################################################
-# INCLUDES                                                         #
+# SOURCES                                                          #
 ####################################################################
 
-INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
+ADD_DEFINITIONS(-DLOCALEDIR=\\\"${CMAKE_INSTALL_PREFIX}/share/locale\\\" -DTEXTDOMAIN=\\\"zypp\\\" )
 
-####################################################################
-# SOURCES                                                          #
-####################################################################
+ADD_EXECUTABLE(mkarray ${CMAKE_SOURCE_DIR}/zypp/cache/schema/mkarray.c )
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+#FILE(WRITE filename "message to write"... )
 
-ADD_DEFINITIONS(-DLOCALEDIR=\\\"/usr/share/libzypp\\\" -DTEXTDOMAIN=\\\"zypp\\\" )
+ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_BINARY_DIR}/zypp/sqlite-schema.h PRE_BUILD COMMAND "${CMAKE_BINARY_DIR}/zypp/mkarray" ARGS "${CMAKE_SOURCE_DIR}/zypp/cache/schema/schema.sql" "schemaData" "${CMAKE_BINARY_DIR}/zypp/sqlite-schema.h" DEPENDS mkarray DEPENDS ${CMAKE_SOURCE_DIR}/zypp/cache/schema/schema.sql )
 
 SET( zypp_SRCS
+  ZConfig.cc
+  LanguageCode.cc
   Arch.cc
   Atom.cc
   ByteCount.cc
+  Capability.cc
   CapFactory.cc
   CapMatch.cc
   CapSet.cc
-  Capability.cc
-  Changelog.cc
   CheckSum.cc
   CountryCode.cc
   Date.cc
   Dep.cc
   Dependencies.cc
-  Digest.cc
-  DiskUsage.cc
-  DiskUsageCounter.cc
   Edition.cc
-  ExternalProgram.cc
-  KeyRing.cc
   Language.cc
-  LanguageCode.cc
   Locale.cc
-  MediaSetAccess.cc
-  Message.cc
   NVR.cc
   NVRA.cc
   NVRAD.cc
-  NameKindProxy.cc
-  Package.cc
-  Patch.cc
-  PathInfo.cc
-  Pathname.cc
-  Pattern.cc
-  PoolItem.cc
-  ProblemSolution.cc
-  Product.cc
-  PublicKey.cc
   Range.cc
   Rel.cc
   ResObject.cc
-  ResPool.cc
-  ResPoolManager.cc
-  ResPoolProxy.cc
+  SystemResObject.cc
+  Resolvable.cc
+  ResTraits.cc
   ResStatus.cc
   ResStore.cc
-  ResTraits.cc
-  Resolvable.cc
+  PoolItem.cc
+  ResPool.cc
+  NameKindProxy.cc
+  ResPoolProxy.cc
+  ResPoolManager.cc
   Resolver.cc
   ResolverProblem.cc
-  Script.cc
-  Selection.cc
-  Signature.cc
-  Source.cc
-  SourceCache.cc
-  SourceFactory.cc
-  SourceFeed.cc
-  SourceManager.cc
+  ProblemSolution.cc
+  Package.cc
+  Pathname.cc
+  ProgressData.cc
   SrcPackage.cc
   SysContent.cc
-  SystemResObject.cc
   Target.cc
-  TmpPath.cc
-  TranslatedText.cc
-  UpgradeStatistics.cc
+  Selection.cc
+  Pattern.cc
+  Message.cc
+  Script.cc
+  Patch.cc
+  Product.cc
+  Changelog.cc
+  ExternalProgram.cc
+  PathInfo.cc
+  Digest.cc
   Url.cc
+  TmpPath.cc
+  DiskUsage.cc
+  DiskUsageCounter.cc
   VendorAttr.cc
+  UpgradeStatistics.cc
   ZYpp.cc
   ZYppCommitPolicy.cc
   ZYppCommitResult.cc
+  TranslatedText.cc
   ZYppFactory.cc
+  PublicKey.cc
+  Signature.cc
+  KeyRing.cc
+  MediaSetAccess.cc
+  ProvideFilePolicy.cc
+  OnMediaLocation.cc
+  Fetcher.cc
+  FileChecker.cc
+  Repository.cc
+  RepoInfo.cc
+  RepoStatus.cc
+  RepoManager.cc
+  MediaProducts.cc
+  Locks.cc
 )
 
 SET( zypp_HEADERS
+  ZConfig.h
   Arch.h
   Atom.h
   AutoDispose.h
@@ -109,6 +117,7 @@ SET( zypp_HEADERS
   DiskUsageCounter.h
   Edition.h
   ExternalProgram.h
+  Fetcher.h
   KVMap.h
   KeyRing.h
   Language.h
@@ -122,15 +131,19 @@ SET( zypp_HEADERS
   NVRAD.h
   NameKindProxy.h
   NeedAType.h
+  OnMediaLocation.h
   Package.h
+  PackageKeyword.h
   Patch.h
   PathInfo.h
   Pathname.h
+  ProgressData.h
   Pattern.h
   PoolItem.h
   ProblemSolution.h
   ProblemTypes.h
   Product.h
+  ProvideFilePolicy.h
   PublicKey.h
   Range.h
   Rel.h
@@ -150,11 +163,6 @@ SET( zypp_HEADERS
   Selection.h
   Signature.h
   SilentCallbacks.h
-  Source.h
-  SourceCache.h
-  SourceFactory.h
-  SourceFeed.h
-  SourceManager.h
   SrcPackage.h
   SysContent.h
   SystemResObject.h
@@ -171,31 +179,42 @@ SET( zypp_HEADERS
   ZYppCommitPolicy.h
   ZYppCommitResult.h
   ZYppFactory.h
+  FileChecker.h
+  Repository.h
+  RepoInfo.h
+  RepoStatus.h
+  RepoManager.h
+  MediaProducts.h
+  Locks.h
 )
 
-INSTALL_FILES(  FILES
-  ${zypp_HEADERS}
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp
-)
+INSTALL(  FILES ${zypp_HEADERS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/zypp" )
 
 SET( zypp_base_SRCS
-  base/Exception.cc
-  base/ExternalDataSource.cc
+  base/SerialNumber.cc
+  base/Random.cc
+  base/Measure.cc
   base/Fd.cc
   base/Gettext.cc
   base/GzStream.cc
   base/IOStream.cc
   base/InputStream.cc
-  base/LogControl.cc
-  base/Measure.cc
-  base/ProfilingFormater.cc
   base/ReferenceCounted.cc
   base/String.cc
-  base/Sysconfig.cc
+  base/Regex.cc
   base/Unit.cc
+  base/ExternalDataSource.cc
+  base/Exception.cc
+  base/UserRequestException.cc
+  base/Sysconfig.cc
+  base/ProfilingFormater.cc
+  base/LogControl.cc
 )
 
 SET( zypp_base_HEADERS
+  base/SerialNumber.h
+  base/Easy.h
+  base/Random.h
   base/Algorithm.h
   base/Counter.h
   base/Debug.h
@@ -204,6 +223,7 @@ SET( zypp_base_HEADERS
   base/Deprecated.h
   base/DtorReset.h
   base/Exception.h
+  base/UserRequestException.h
   base/ExternalDataSource.h
   base/Fd.h
   base/Function.h
@@ -226,11 +246,14 @@ SET( zypp_base_HEADERS
   base/ReferenceCounted.h
   base/SafeBool.h
   base/String.h
+  base/Regex.h
   base/Sysconfig.h
+  base/UniqueString.h
   base/Unit.h
+  base/WatchFile.h
 )
 
-INSTALL_FILES(  FILES
+INSTALL(  FILES
   ${zypp_base_HEADERS}
   DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/base
 )
@@ -241,6 +264,7 @@ SET( zypp_capability_SRCS
   capability/FileCap.cc
   capability/HalCap.cc
   capability/ModaliasCap.cc
+  capability/FilesystemCap.cc
   capability/NamedCap.cc
   capability/NullCap.cc
   capability/SplitCap.cc
@@ -255,6 +279,7 @@ SET( zypp_capability_HEADERS
   capability/FileCap.h
   capability/HalCap.h
   capability/ModaliasCap.h
+  capability/FilesystemCap.h
   capability/NamedCap.h
   capability/NullCap.h
   capability/OrCap.h
@@ -262,22 +287,24 @@ SET( zypp_capability_HEADERS
   capability/VersionedCap.h
 )
 
-INSTALL_FILES(  FILES
+INSTALL(  FILES
   ${zypp_capability_HEADERS}
   DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/capability
 )
 
 SET( zypp_data_SRCS
   data/ResolvableData.cc
+  data/RecordId.cc
   data/ResolvableDataConsumer.cc
 )
 
 SET( zypp_data_HEADERS
   data/ResolvableData.h
+  data/RecordId.h
   data/ResolvableDataConsumer.h
 )
 
-INSTALL_FILES(  FILES
+INSTALL(  FILES
   ${zypp_data_HEADERS}
   DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/data
 )
@@ -331,26 +358,27 @@ SET( zypp_detail_HEADERS
   detail/SrcPackageImplIf.h
 )
 
-INSTALL_FILES(  FILES
+INSTALL(  FILES
   ${zypp_detail_HEADERS}
   DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/detail
 )
 
 SET( zypp_media_SRCS
+  media/MediaException.cc
   media/MediaAccess.cc
+  media/MediaHandler.cc
+  media/Mount.cc
+  media/MediaNFS.cc
   media/MediaCD.cc
-  media/MediaCIFS.cc
-  media/MediaCurl.cc
   media/MediaDIR.cc
   media/MediaDISK.cc
-  media/MediaException.cc
-  media/MediaHandler.cc
-  media/MediaISO.cc
-  media/MediaManager.cc
-  media/MediaNFS.cc
   media/MediaSMB.cc
-  media/Mount.cc
+  media/MediaCIFS.cc
   media/ProxyInfo.cc
+  media/MediaCurl.cc
+  media/MediaISO.cc
+  media/MediaManager.cc
+  media/MediaUserAuth.cc
 )
 
 SET( zypp_media_HEADERS
@@ -367,11 +395,12 @@ SET( zypp_media_HEADERS
   media/MediaNFS.h
   media/MediaSMB.h
   media/MediaSource.h
+  media/MediaUserAuth.h
   media/Mount.h
   media/ProxyInfo.h
 )
 
-INSTALL_FILES(  FILES
+INSTALL(  FILES
   ${zypp_media_HEADERS}
   DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/media
 )
@@ -386,43 +415,76 @@ SET( zypp_media_proxyinfo_HEADERS
   media/proxyinfo/ProxyInfos.h
 )
 
-INSTALL_FILES(  FILES
+INSTALL(  FILES
   ${zypp_media_proxyinfo_HEADERS}
   DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/media/proxyinfo
 )
 
 SET( zypp_parser_SRCS
+  parser/ParseException.cc
+  parser/TagParser.cc
+  parser/IniParser.cc
+  parser/IniDict.cc
   parser/LibXMLHelper.cc
-  parser/SAXParser.cc
   parser/XMLNodeIterator.cc
+  parser/RepoFileReader.cc
 )
 
 SET( zypp_parser_HEADERS
+  parser/ParseException.h
+  parser/TagParser.h
+  parser/IniParser.h
+  parser/IniDict.h
   parser/LibXMLHelper.h
   parser/ParserProgress.h
-  parser/SAXParser.h
   parser/XMLNodeIterator.h
   parser/xml_parser_assert.h
+  parser/RepoFileReader.h
 )
 
-INSTALL_FILES(  FILES
+INSTALL(  FILES
   ${zypp_parser_HEADERS}
   DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/parser
 )
 
-SET( zypp_parser_tagfile_SRCS
-  parser/tagfile/ParseException.cc
-  parser/tagfile/TagFileParser.cc
+SET( zypp_parser_susetags_SRCS
+  parser/susetags/RepoIndex.cc
+  parser/susetags/ContentFileReader.cc
+  parser/susetags/PackagesFileReader.cc
+  parser/susetags/PackagesLangFileReader.cc
+  parser/susetags/PackagesDuFileReader.cc
+  parser/susetags/PatternFileReader.cc
+  parser/susetags/RepoParser.cc
+)
+
+SET( zypp_parser_susetags_HEADERS
+  parser/susetags/RepoIndex.h
+  parser/susetags/ContentFileReader.h
+  parser/susetags/FileReaderBase.h
+  parser/susetags/FileReaderBaseImpl.h
+  parser/susetags/PackagesFileReader.h
+  parser/susetags/PackagesLangFileReader.h
+  parser/susetags/PackagesDuFileReader.h
+  parser/susetags/PatternFileReader.h
+  parser/susetags/RepoParser.h
 )
 
-SET( zypp_parser_tagfile_HEADERS
-  parser/tagfile/ParseException.h
-  parser/tagfile/TagFileParser.h
+INSTALL(  FILES
+  ${zypp_parser_susetags_HEADERS}
+  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/parser/susetags
 )
 
-INSTALL_FILES(  FILES
-  ${zypp_parser_tagfile_HEADERS}
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/parser/tagfile
+SET( zypp_parser_plaindir_SRCS
+  parser/plaindir/RepoParser.cc
+)
+
+SET( zypp_parser_plaindir_HEADERS
+  parser/plaindir/RepoParser.h
+)
+
+INSTALL(  FILES
+  ${zypp_parser_plaindir_HEADERS}
+  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/parser/plaindir
 )
 
 SET( zypp_parser_xml_SRCS
@@ -446,7 +508,7 @@ SET( zypp_parser_xml_HEADERS
   parser/xml/libxmlfwd.h
 )
 
-INSTALL_FILES(  FILES
+INSTALL(  FILES
   ${zypp_parser_xml_HEADERS}
   DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/parser/xml
 )
@@ -472,57 +534,45 @@ SET( zypp_parser_xmlstore_HEADERS
   parser/xmlstore/schemanames.h
 )
 
-INSTALL_FILES(  FILES
+INSTALL(  FILES
   ${zypp_parser_xmlstore_HEADERS}
   DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/parser/xmlstore
 )
 
 SET( zypp_parser_yum_SRCS
-  parser/yum/YUMFileListParser.cc
-  parser/yum/YUMGroupParser.cc
-  parser/yum/YUMOtherParser.cc
-  parser/yum/YUMParserData.cc
-  parser/yum/YUMPatchParser.cc
-  parser/yum/YUMPatchesParser.cc
-  parser/yum/YUMPatternParser.cc
-  parser/yum/YUMPrimaryParser.cc
-  parser/yum/YUMProductParser.cc
-  parser/yum/YUMRepomdParser.cc
+  parser/yum/RepoParser.cc
+  parser/yum/FileReaderBaseImpl.cc
+  parser/yum/RepomdFileReader.cc
+  parser/yum/PatchesFileReader.cc
+  parser/yum/PrimaryFileReader.cc
+  parser/yum/OtherFileReader.cc
+  parser/yum/FilelistsFileReader.cc
+  parser/yum/PatchFileReader.cc
+  parser/yum/PatternFileReader.cc
+  parser/yum/ProductFileReader.cc
 )
 
 SET( zypp_parser_yum_HEADERS
-  parser/yum/YUMFileListParser.h
-  parser/yum/YUMGroupParser.h
-  parser/yum/YUMOtherParser.h
-  parser/yum/YUMParser.h
-  parser/yum/YUMParserData.h
-  parser/yum/YUMPatchParser.h
-  parser/yum/YUMPatchesParser.h
-  parser/yum/YUMPatternParser.h
-  parser/yum/YUMPrimaryParser.h
-  parser/yum/YUMProductParser.h
-  parser/yum/YUMRepomdParser.h
+  parser/yum/RepoParser.h
+  parser/yum/RepoParserOpts.h
+  parser/yum/FileReaderBase.h
+  parser/yum/FileReaderBaseImpl.h
+  parser/yum/RepomdFileReader.h
+  parser/yum/PatchesFileReader.h
+  parser/yum/PrimaryFileReader.h
+  parser/yum/OtherFileReader.h
+  parser/yum/FilelistsFileReader.h
+  parser/yum/PatchFileReader.h
+  parser/yum/PatternFileReader.h
+  parser/yum/ProductFileReader.h
   parser/yum/schemanames.h
 )
 
-INSTALL_FILES(  FILES
+INSTALL(  FILES
   ${zypp_parser_yum_HEADERS}
   DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/parser/yum
 )
 
-SET( zypp_parser_yum2_SRCS
-  parser/yum2/YUMPrimaryParser.cc
-)
-
-SET( zypp_parser_yum2_HEADERS
-  parser/yum2/YUMPrimaryParser.h
-)
-
-INSTALL_FILES(  FILES
-  ${zypp_parser_yum2_HEADERS}
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/parser/yum2
-)
-
 SET( zypp_pool_SRCS
   pool/GetResolvablesToInsDel.cc
   pool/PoolImpl.cc
@@ -536,7 +586,7 @@ SET( zypp_pool_HEADERS
   pool/PoolTraits.h
 )
 
-INSTALL_FILES(  FILES
+INSTALL(  FILES
   ${zypp_pool_HEADERS}
   DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/pool
 )
@@ -551,6 +601,8 @@ SET( zypp_solver_detail_SRCS
   solver/detail/ProblemSolutionKeep.cc
   solver/detail/ProblemSolutionUninstall.cc
   solver/detail/ProblemSolutionUnlock.cc
+  solver/detail/ProblemSolutionAllBranches.cc
+  solver/detail/ProblemSolutionDoubleTimeout.cc
   solver/detail/QueueItem.cc
   solver/detail/QueueItemBranch.cc
   solver/detail/QueueItemConflict.cc
@@ -575,6 +627,7 @@ SET( zypp_solver_detail_SRCS
   solver/detail/Resolver_problems.cc
   solver/detail/SolutionAction.cc
   solver/detail/Testcase.cc
+  solver/detail/ContextPool.cc
 )
 
 SET( zypp_solver_detail_HEADERS
@@ -587,6 +640,8 @@ SET( zypp_solver_detail_HEADERS
   solver/detail/ProblemSolutionKeep.h
   solver/detail/ProblemSolutionUninstall.h
   solver/detail/ProblemSolutionUnlock.h
+  solver/detail/ProblemSolutionAllBranches.h
+  solver/detail/ProblemSolutionDoubleTimeout.h
   solver/detail/QueueItem.h
   solver/detail/QueueItemBranch.h
   solver/detail/QueueItemConflict.h
@@ -610,120 +665,14 @@ SET( zypp_solver_detail_HEADERS
   solver/detail/SolutionAction.h
   solver/detail/Testcase.h
   solver/detail/Types.h
+  solver/detail/ContextPool.h
 )
 
-INSTALL_FILES(  FILES
+INSTALL(  FILES
   ${zypp_solver_detail_HEADERS}
   DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/solver/detail
 )
 
-SET( zypp_source_SRCS
-  source/Applydeltarpm.cc
-  source/MediaSet.cc
-  source/OnMediaLocation.cc
-  source/PackageDelta.cc
-  source/PackageProvider.cc
-  source/SourceImpl.cc
-  source/SourceInfo.cc
-  source/SourceProvideFile.cc
-)
-
-SET( zypp_source_HEADERS
-  source/Applydeltarpm.h
-  source/Builtin.h
-  source/MediaSet.h
-  source/OnMediaLocation.h
-  source/PackageDelta.h
-  source/PackageProvider.h
-  source/SourceImpl.h
-  source/SourceInfo.h
-  source/SourceProvideFile.h
-)
-
-INSTALL_FILES(  FILES
-  ${zypp_source_HEADERS}
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/source
-)
-
-SET( zypp_source_plaindir_SRCS
-  source/plaindir/PlaindirImpl.cc
-)
-
-SET( zypp_source_plaindir_HEADERS
-  source/plaindir/PlaindirImpl.h
-)
-
-INSTALL_FILES(  FILES
-  ${zypp_source_plaindir_HEADERS}
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/source/plaindir
-)
-
-SET( zypp_source_susetags_SRCS
-  source/susetags/MediaMetadataParser.cc
-  source/susetags/MediaPatchesMetadataParser.cc
-  source/susetags/PackagesLangParser.cc
-  source/susetags/PackagesParser.cc
-  source/susetags/PatternTagFileParser.cc
-  source/susetags/ProductMetadataParser.cc
-  source/susetags/SelectionTagFileParser.cc
-  source/susetags/SuseTagsImpl.cc
-  source/susetags/SuseTagsPackageImpl.cc
-  source/susetags/SuseTagsPatternImpl.cc
-  source/susetags/SuseTagsProductImpl.cc
-  source/susetags/SuseTagsSelectionImpl.cc
-  source/susetags/SuseTagsSrcPackageImpl.cc
-)
-
-SET( zypp_source_susetags_HEADERS
-  source/susetags/MediaMetadataParser.h
-  source/susetags/MediaPatchesMetadataParser.h
-  source/susetags/PackagesLangParser.h
-  source/susetags/PackagesParser.h
-  source/susetags/PatternTagFileParser.h
-  source/susetags/ProductMetadataParser.h
-  source/susetags/SelectionTagFileParser.h
-  source/susetags/SuseTagsImpl.h
-  source/susetags/SuseTagsPackageImpl.h
-  source/susetags/SuseTagsPatternImpl.h
-  source/susetags/SuseTagsProductImpl.h
-  source/susetags/SuseTagsSelectionImpl.h
-  source/susetags/SuseTagsSrcPackageImpl.h
-)
-
-INSTALL_FILES(  FILES
-  ${zypp_source_susetags_HEADERS}
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/source/susetags
-)
-
-SET( zypp_source_yum_SRCS
-  source/yum/YUMAtomImpl.cc
-  source/yum/YUMGroupImpl.cc
-  source/yum/YUMMessageImpl.cc
-  source/yum/YUMPackageImpl.cc
-  source/yum/YUMPatchImpl.cc
-  source/yum/YUMPatternImpl.cc
-  source/yum/YUMProductImpl.cc
-  source/yum/YUMScriptImpl.cc
-  source/yum/YUMSourceImpl.cc
-)
-
-SET( zypp_source_yum_HEADERS
-  source/yum/YUMAtomImpl.h
-  source/yum/YUMGroupImpl.h
-  source/yum/YUMMessageImpl.h
-  source/yum/YUMPackageImpl.h
-  source/yum/YUMPatchImpl.h
-  source/yum/YUMPatternImpl.h
-  source/yum/YUMProductImpl.h
-  source/yum/YUMScriptImpl.h
-  source/yum/YUMSourceImpl.h
-)
-
-INSTALL_FILES(  FILES
-  ${zypp_source_yum_HEADERS}
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/source/yum
-)
-
 SET( zypp_target_SRCS
   target/CommitLog.cc
   target/CommitPackageCache.cc
@@ -744,7 +693,7 @@ SET( zypp_target_HEADERS
   target/TargetImpl.h
 )
 
-INSTALL_FILES(  FILES
+INSTALL(  FILES
   ${zypp_target_HEADERS}
   DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/target
 )
@@ -760,7 +709,7 @@ SET( zypp_target_hal_HEADERS
   target/hal/HalException.h
 )
 
-INSTALL_FILES(  FILES
+INSTALL(  FILES
   ${zypp_target_hal_HEADERS}
   DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/target/hal
 )
@@ -773,7 +722,7 @@ SET( zypp_target_modalias_HEADERS
   target/modalias/Modalias.h
 )
 
-INSTALL_FILES(  FILES
+INSTALL(  FILES
   ${zypp_target_modalias_HEADERS}
   DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/target/modalias
 )
@@ -800,7 +749,7 @@ SET( zypp_target_rpm_HEADERS
   target/rpm/librpmDb.h
 )
 
-INSTALL_FILES(  FILES
+INSTALL(  FILES
   ${zypp_target_rpm_HEADERS}
   DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/target/rpm
 )
@@ -822,7 +771,7 @@ SET( zypp_target_store_HEADERS
   target/store/xml_escape_parser.hpp
 )
 
-INSTALL_FILES(  FILES
+INSTALL(  FILES
   ${zypp_target_store_HEADERS}
   DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/target/store
 )
@@ -847,7 +796,7 @@ SET( zypp_target_store_xml_HEADERS
   target/store/xml/XMLSelectionImpl.h
 )
 
-INSTALL_FILES(  FILES
+INSTALL(  FILES
   ${zypp_target_store_xml_HEADERS}
   DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/target/store/xml
 )
@@ -863,7 +812,7 @@ SET( zypp_thread_HEADERS
   thread/Once.h
 )
 
-INSTALL_FILES(  FILES
+INSTALL(  FILES
   ${zypp_thread_HEADERS}
   DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/thread
 )
@@ -894,14 +843,14 @@ SET( zypp_ui_HEADERS
   ui/UserWantedPackages.h
 )
 
-INSTALL_FILES(  FILES
+INSTALL(  FILES
   ${zypp_ui_HEADERS}
   DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/ui
 )
 
 SET( zypp_url_SRCS
-  url/UrlBase.cc
   url/UrlUtils.cc
+  url/UrlBase.cc
 )
 
 SET( zypp_url_HEADERS
@@ -910,7 +859,7 @@ SET( zypp_url_HEADERS
   url/UrlUtils.h
 )
 
-INSTALL_FILES(  FILES
+INSTALL(  FILES
   ${zypp_url_HEADERS}
   DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/url
 )
@@ -924,80 +873,280 @@ SET( zypp_zypp_detail_HEADERS
   zypp_detail/ZYppReadOnlyHack.h
 )
 
-INSTALL_FILES(  FILES
+INSTALL(  FILES
   ${zypp_zypp_detail_HEADERS}
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/zypp/detail
+  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/zypp_detail
+)
+
+SET( zypp_cache_SRCS
+  ${CMAKE_BINARY_DIR}/zypp/sqlite-schema.h
+  cache/CacheInitializer.cc
+  cache/CacheException.cc
+  cache/Attribute.cc
+  cache/CacheTypes.cc
+  cache/ResolvableQuery.cc
+  cache/CacheStore.cc
+  cache/CacheFSCK.cc
+  cache/Utils.cc
+)
+
+SET( zypp_cache_HEADERS
+  cache/Attribute.h
+  cache/CacheAttributes.h
+  cache/CacheTypes.h
+  cache/CacheInitializer.h
+  cache/CacheException.h
+  cache/CacheStore.h
+  cache/CacheFSCK.h
+  cache/ResolvableQuery.h
+  cache/Utils.h
+)
+
+INSTALL(  FILES
+  ${zypp_cache_HEADERS}
+  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/cache
+)
+
+SET( zypp_cache_sqlite3x_SRCS
+  cache/sqlite3x/sqlite3x_command.cpp
+  cache/sqlite3x/sqlite3x_connection.cpp
+  cache/sqlite3x/sqlite3x_exception.cpp
+  cache/sqlite3x/sqlite3x_reader.cpp
+  cache/sqlite3x/sqlite3x_transaction.cpp
+)
+
+SET( zypp_cache_sqlite3x_HEADERS
+  cache/sqlite3x/sqlite3x.hpp
+)
+
+#INSTALL(  FILES
+#  ${zypp_cache_sqlite3x_HEADERS}
+#  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/cache/sqlite3x
+#)
+
+SET( zypp_repo_SRCS
+  repo/dummy.cc
+  repo/RepositoryImpl.cc
+  repo/RepoException.cc
+  repo/RepoType.cc
+  repo/PackageProvider.cc
+  repo/SrcPackageProvider.cc
+  repo/ScriptProvider.cc
+  repo/RepoProvideFile.cc
+  repo/DeltaCandidates.cc
+  repo/Applydeltarpm.cc
+  repo/PackageDelta.cc
+  repo/SUSEMediaVerifier.cc
+  repo/MediaInfoDownloader.cc
+  repo/Downloader.cc
+  repo/RepoVariables.cc
+)
+
+SET( zypp_repo_HEADERS
+  repo/RepositoryImpl.h
+  repo/RepoException.h
+  repo/RepoType.h
+  repo/PackageProvider.h
+  repo/SrcPackageProvider.h
+  repo/ScriptProvider.h
+  repo/RepoProvideFile.h
+  repo/DeltaCandidates.h
+  repo/Applydeltarpm.h
+  repo/PackageDelta.h
+  repo/SUSEMediaVerifier.h
+  repo/MediaInfoDownloader.h
+  repo/Downloader.h
+  repo/RepoVariables.h
+)
+
+INSTALL( FILES
+  ${zypp_repo_HEADERS}
+  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/repo
+)
+
+SET( zypp_repo_cached_SRCS
+  repo/cached/RepoImpl.cc
+  repo/cached/PackageImpl.cc
+  repo/cached/SrcPackageImpl.cc
+  repo/cached/PatchImpl.cc
+  repo/cached/PatternImpl.cc
+  repo/cached/ProductImpl.cc
+  repo/cached/MessageImpl.cc
+  repo/cached/ScriptImpl.cc
+  repo/cached/AtomImpl.cc
+)
+
+SET( zypp_repo_cached_HEADERS
+  repo/cached/RepoImpl.h
+  repo/cached/PackageImpl.h
+  repo/cached/SrcPackageImpl.h
+  repo/cached/PatchImpl.h
+  repo/cached/PatternImpl.h
+  repo/cached/ProductImpl.h
+  repo/cached/MessageImpl.h
+  repo/cached/ScriptImpl.h
+  repo/cached/AtomImpl.h
+)
+
+SET( zypp_repo_yum_SRCS
+  repo/yum/Downloader.cc
+  repo/yum/ResourceType.cc
+)
+
+SET( zypp_repo_yum_HEADERS
+  repo/yum/Downloader.h
+  repo/yum/ResourceType.h
+)
+
+SET( zypp_repo_susetags_SRCS
+  repo/susetags/Downloader.cc
+)
+
+SET( zypp_repo_susetags_HEADERS
+  repo/susetags/Downloader.h
+)
+
+
+SET( zypp_repo_data_SRCS
+  repo/memory/ScriptImpl.cc
+  repo/memory/MessageImpl.cc
+  repo/memory/PackageImpl.cc
+  repo/memory/PatternImpl.cc
+  repo/memory/ProductImpl.cc
+  repo/memory/PatchImpl.cc
+  repo/memory/RepoImpl.cc
+  repo/memory/AtomImpl.cc
+  repo/memory/SrcPackageImpl.cc
+)
+
+SET( zypp_repo_data_HEADERS
+  repo/memory/PackageImpl.h
+  repo/memory/PatternImpl.h
+  repo/memory/ProductImpl.h
+  repo/memory/PatchImpl.h
+  repo/memory/RepoImpl.h
+  repo/memory/AtomImpl.h
+  repo/memory/SrcPackageImpl.h
 )
-
 
 SET( zypp_lib_SRCS
-${zypp_source_plaindir_SRCS}
-${zypp_target_store_xml_SRCS}
-${zypp_parser_tagfile_SRCS}
-${zypp_target_rpm_SRCS}
-${zypp_parser_yum2_SRCS}
+${zypp_detail_SRCS}
 ${zypp_capability_SRCS}
-${zypp_ui_SRCS}
+${zypp_cache_SRCS}
+${zypp_cache_sqlite3x_SRCS}
+${zypp_pool_SRCS}
+${zypp_parser_susetags_SRCS}
 ${zypp_parser_xmlstore_SRCS}
+${zypp_parser_xml_SRCS}
+${zypp_parser_yum_SRCS}
+${zypp_parser_plaindir_SRCS}
+${zypp_parser_SRCS}
 ${zypp_data_SRCS}
+${zypp_media_proxyinfo_SRCS}
 ${zypp_media_SRCS}
+${zypp_url_SRCS}
+${zypp_repo_SRCS}
+${zypp_repo_cached_SRCS}
+${zypp_repo_yum_SRCS}
+${zypp_repo_susetags_SRCS}
+${zypp_repo_data_SRCS}
+${zypp_target_store_xml_SRCS}
+${zypp_target_store_SRCS}
+${zypp_target_rpm_SRCS}
 ${zypp_target_hal_SRCS}
-${zypp_parser_xml_SRCS}
-${zypp_media_proxyinfo_SRCS}
-${zypp_source_yum_SRCS}
-${zypp_base_SRCS}
+${zypp_target_modalias_SRCS}
+${zypp_target_SRCS}
 ${zypp_solver_detail_SRCS}
-${zypp_target_store_SRCS}
-${zypp_url_SRCS}
-${zypp_source_SRCS}
-${zypp_parser_SRCS}
-${zypp_SRCS}
+${zypp_ui_SRCS}
 ${zypp_zypp_detail_SRCS}
 ${zypp_thread_SRCS}
-${zypp_source_susetags_SRCS}
-${zypp_target_modalias_SRCS}
-${zypp_target_SRCS}
-${zypp_parser_yum_SRCS}
-${zypp_detail_SRCS}
-${zypp_pool_SRCS}
+${zypp_SRCS}
+${zypp_base_SRCS}
 )
 
 SET( zypp_lib_HEADERS
-${zypp_source_plaindir_HEADERS}
 ${zypp_target_store_xml_HEADERS}
-${zypp_parser_tagfile_HEADERS}
 ${zypp_target_rpm_HEADERS}
-${zypp_parser_yum2_HEADERS}
+${zypp_parser_tagfile_HEADERS}
+${zypp_parser_susetags_HEADERS}
+${zypp_parser_yum_HEADERS}
+${zypp_parser_plaindir_HEADERS}
+${zypp_parser_xml_HEADERS}
+${zypp_parser_HEADERS}
 ${zypp_capability_HEADERS}
+${zypp_cache_HEADERS}
+${zypp_cache_sqlite3x_HEADERS}
 ${zypp_ui_HEADERS}
 ${zypp_parser_xmlstore_HEADERS}
 ${zypp_data_HEADERS}
 ${zypp_media_HEADERS}
 ${zypp_target_hal_HEADERS}
-${zypp_parser_xml_HEADERS}
 ${zypp_media_proxyinfo_HEADERS}
-${zypp_source_yum_HEADERS}
 ${zypp_base_HEADERS}
 ${zypp_solver_detail_HEADERS}
 ${zypp_target_store_HEADERS}
 ${zypp_url_HEADERS}
-${zypp_source_HEADERS}
-${zypp_parser_HEADERS}
 ${zypp_HEADERS}
 ${zypp_zypp_detail_HEADERS}
 ${zypp_thread_HEADERS}
+${zypp_repo_HEADERS}
 ${zypp_source_susetags_HEADERS}
 ${zypp_target_modalias_HEADERS}
 ${zypp_target_HEADERS}
-${zypp_parser_yum_HEADERS}
 ${zypp_detail_HEADERS}
 ${zypp_pool_HEADERS}
 )
 
-ADD_LIBRARY(zypp SHARED ${zypp_lib_SRCS})
+#
+# Macro to set the log group for a list of files
+#
+MACRO( SET_LOGGROUP _group _files  )
+  SET_SOURCE_FILES_PROPERTIES( ${_files} COMPILE_FLAGS -DZYPP_BASE_LOGGER_LOGGROUP=\\"${_group}\\" )
+  FOREACH (_currentFile ${ARGN})
+#MESSAGE( STATUS "setting loggroup to \"${_group}\" for ${_currentFile}" )
+    SET_SOURCE_FILES_PROPERTIES( ${_currentFile} COMPILE_FLAGS -DZYPP_BASE_LOGGER_LOGGROUP=\\"${_group}\\" )
+  ENDFOREACH (_currentFile ${ARGN})
+ENDMACRO( SET_LOGGROUP )
+
+# Default loggroup for all files
+SET_LOGGROUP( "zypp" ${zypp_lib_SRCS} )
+
+# override some defaults
+SET_LOGGROUP( "xmlstore" ${zypp_target_store_xml_SRCS} )
+#SET_LOGGROUP( "group" ${zypp_target_rpm_SRCS} )
+#SET_LOGGROUP( "group" ${zypp_parser_yum2_SRCS} )
+#SET_LOGGROUP( "group" ${zypp_capability_SRCS} )
+#SET_LOGGROUP( "group" ${zypp_ui_SRCS} )
+#SET_LOGGROUP( "group" ${zypp_parser_xmlstore_SRCS} )
+#SET_LOGGROUP( "group" ${zypp_data_SRCS} )
+#SET_LOGGROUP( "group" ${zypp_media_SRCS} )
+#SET_LOGGROUP( "group" ${zypp_target_hal_SRCS} )
+#SET_LOGGROUP( "group" ${zypp_parser_xml_SRCS} )
+#SET_LOGGROUP( "group" ${zypp_media_proxyinfo_SRCS} )
+#SET_LOGGROUP( "group" ${zypp_source_yum_SRCS} )
+#SET_LOGGROUP( "group" ${zypp_base_SRCS} )
+#SET_LOGGROUP( "group" ${zypp_solver_detail_SRCS} )
+#SET_LOGGROUP( "group" ${zypp_target_store_SRCS} )
+#SET_LOGGROUP( "group" ${zypp_url_SRCS} )
+#SET_LOGGROUP( "group" ${zypp_source_SRCS} )
+#SET_LOGGROUP( "group" ${zypp_parser_SRCS} )
+#SET_LOGGROUP( "group" ${zypp_SRCS} )
+#SET_LOGGROUP( "group" ${zypp_zypp_detail_SRCS} )
+#SET_LOGGROUP( "group" ${zypp_thread_SRCS} )
+#SET_LOGGROUP( "group" ${zypp_source_susetags_SRCS} )
+#SET_LOGGROUP( "group" ${zypp_target_modalias_SRCS} )
+#SET_LOGGROUP( "group" ${zypp_target_SRCS} )
+#SET_LOGGROUP( "group" ${zypp_parser_yum_SRCS} )
+#SET_LOGGROUP( "group" ${zypp_detail_SRCS} )
+#SET_LOGGROUP( "group" ${zypp_pool_SRCS} )
+
 
+ADD_LIBRARY(zypp SHARED ${zypp_lib_SRCS})
+SET_TARGET_PROPERTIES( zypp PROPERTIES VERSION "${LIBZYPP_VERSION_INFO}" )
+SET_TARGET_PROPERTIES( zypp PROPERTIES SOVERSION "${LIBZYPP_SOVERSION_INFO}" )
+ADD_DEPENDENCIES(zypp schema_header)
 # System libraries
-TARGET_LINK_LIBRARIES(zypp boost_filesystem boost_regex util )
+TARGET_LINK_LIBRARIES(zypp boost_filesystem util )
 TARGET_LINK_LIBRARIES(zypp ${DBUS_LIBRARY} )
 TARGET_LINK_LIBRARIES(zypp dbus-glib-1 )
 TARGET_LINK_LIBRARIES(zypp ${GLIB_LIBRARY} )
@@ -1012,17 +1161,9 @@ TARGET_LINK_LIBRARIES(zypp ${ZLIB_LIBRARY} )
 
 INSTALL(TARGETS zypp LIBRARY DESTINATION ${LIB_INSTALL_DIR} )
 
-FILE(GLOB YUM_SCHEMA_FILES ${CMAKE_SOURCE_DIR}/zypp/parser/yum/schema/*.rng)
-INSTALL(FILES ${YUM_SCHEMA_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/zypp/schema/yum)
-FILE(GLOB XMLSTORE_SCHEMA_FILES ${CMAKE_SOURCE_DIR}/zypp/parser/yum/xmlstore/*.rng)
-INSTALL(FILES ${XMLSTORE_SCHEMA_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/zypp/schema/xmlstore)
-
-filelists.rng
-other.rng
-patch.rng
-primary.rng
-repomd.rng
-suse-primary.rng
-groups.rng     patches.rng  patterns.rng  product.rng  rpm-ns.rng
+# install XML schemas
+FILE( GLOB YUM_SCHEMA_FILES ${CMAKE_SOURCE_DIR}/zypp/parser/yum/schema/*.rng )
+INSTALL(FILES ${YUM_SCHEMA_FILES} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/zypp/schema/yum" )
+
+FILE( GLOB XMLSTORE_SCHEMA_FILES ${CMAKE_SOURCE_DIR}/zypp/parser/xmlstore/schema/*.rng )
+INSTALL(FILES ${XMLSTORE_SCHEMA_FILES} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/zypp/schema/xmlstore" )