Imported Upstream version 16.3.2
[platform/upstream/libzypp.git] / zypp / CMakeLists.txt
index 846e3cb..4919a50 100644 (file)
@@ -1,26 +1,34 @@
-####################################################################
-# SOURCES                                                          #
-####################################################################
+# Collect all files that may contain translatable texts
+FILE( GLOB_RECURSE POT_FILE_DEPENDS RELATIVE ${LIBZYPP_SOURCE_DIR} "*.h" "*.cc" )
+SET( POT_FILE_DEPENDS ${POT_FILE_DEPENDS} PARENT_SCOPE )
 
-ADD_DEFINITIONS(-DLOCALEDIR="${CMAKE_INSTALL_PREFIX}/share/locale" -DTEXTDOMAIN="zypp" )
+
+ADD_DEFINITIONS(-DLOCALEDIR="${CMAKE_INSTALL_PREFIX}/share/locale" -DTEXTDOMAIN="zypp" -DZYPP_DLL )
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 #FILE(WRITE filename "message to write"... )
 
 SET( zypp_SRCS
+  Application.cc
   ByteCount.cc
   Capabilities.cc
   Capability.cc
   CapMatch.cc
   Changelog.cc
   CheckSum.cc
+  CpeId.cc
   Date.cc
   Dep.cc
   Digest.cc
-  DiskUsage.cc
   DiskUsageCounter.cc
+  DownloadMode.cc
   Edition.cc
   ExternalProgram.cc
+  PluginFrame.cc
+  PluginFrameException.cc
+  PluginScript.cc
+  PluginScriptException.cc
+  PluginExecutor.cc
   Fetcher.cc
   FileChecker.cc
   Glob.cc
@@ -30,10 +38,7 @@ SET( zypp_SRCS
   InstanceId.cc
   KeyRing.cc
   Locks.cc
-  MediaProducts.cc
   MediaSetAccess.cc
-  Misc.cc
-  NameKindProxy.cc
   OnMediaLocation.cc
   Package.cc
   Patch.cc
@@ -41,6 +46,7 @@ SET( zypp_SRCS
   Pathname.cc
   Pattern.cc
   PoolItem.cc
+  PoolItemBest.cc
   PoolQuery.cc
   PoolQueryResult.cc
   ProblemSolution.cc
@@ -85,9 +91,12 @@ SET( zypp_EARLY_SRCS
 )
 
 SET( zypp_HEADERS
+  APIConfig.h
+  Application.h
   Arch.h
   AutoDispose.h
   Bit.h
+  Bitmap.h
   ByteCount.h
   Callback.h
   Capabilities.h
@@ -95,14 +104,21 @@ SET( zypp_HEADERS
   CapMatch.h
   Changelog.h
   CheckSum.h
+  ContentType.h
   CountryCode.h
+  CpeId.h
   Date.h
   Dep.h
   Digest.h
   DiskUsageCounter.h
-  DiskUsage.h
+  DownloadMode.h
   Edition.h
   ExternalProgram.h
+  PluginFrame.h
+  PluginFrameException.h
+  PluginScript.h
+  PluginScriptException.h
+  PluginExecutor.h
   Fetcher.h
   FileChecker.h
   Glob.h
@@ -120,8 +136,6 @@ SET( zypp_HEADERS
   ManagedFile.h
   MediaProducts.h
   MediaSetAccess.h
-  Misc.h
-  NameKindProxy.h
   Vendor.h
   OnMediaLocation.h
   Package.h
@@ -131,6 +145,7 @@ SET( zypp_HEADERS
   Pathname.h
   Pattern.h
   PoolItem.h
+  PoolItemBest.h
   PoolQuery.h
   PoolQueryUtil.tcc
   PoolQueryResult.h
@@ -154,6 +169,7 @@ SET( zypp_HEADERS
   ResObjects.h
   Resolvable.h
   Resolver.h
+  ResolverNamespace.h
   ResolverProblem.h
   ResPool.h
   ResPoolProxy.h
@@ -167,6 +183,7 @@ SET( zypp_HEADERS
   TmpPath.h
   TriBool.h
   Url.h
+  UserData.h
   VendorAttr.h
   VendorSupportOptions.h
   ZConfig.h
@@ -178,10 +195,11 @@ SET( zypp_HEADERS
   ZYpp.h
 )
 
-INSTALL(  FILES ${zypp_HEADERS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/zypp" )
+INSTALL(  FILES ${zypp_HEADERS} DESTINATION "${INCLUDE_INSTALL_DIR}/zypp" )
 
 SET( zypp_base_SRCS
   base/InterProcessMutex.cc
+  base/Backtrace.cc
   base/SerialNumber.cc
   base/Random.cc
   base/Measure.cc
@@ -191,7 +209,10 @@ SET( zypp_base_SRCS
   base/IOStream.cc
   base/InputStream.cc
   base/ReferenceCounted.cc
+  base/SetRelationMixin.cc
   base/String.cc
+  base/StrMatcher.h
+  base/StrMatcher.cc
   base/Regex.cc
   base/Unit.cc
   base/ExternalDataSource.cc
@@ -204,19 +225,20 @@ SET( zypp_base_SRCS
 
 SET( zypp_base_HEADERS
   base/InterProcessMutex.h
+  base/Backtrace.h
   base/Collector.h
   base/SerialNumber.h
   base/Easy.h
+  base/Errno.h
   base/Random.h
   base/Algorithm.h
   base/Counter.h
   base/Debug.h
-  base/DefaultFalseBool.h
   base/DefaultIntegral.h
-  base/Deprecated.h
   base/DtorReset.h
   base/Exception.h
   base/UserRequestException.h
+  base/EnumClass.h
   base/ExternalDataSource.h
   base/Fd.h
   base/Flags.h
@@ -224,30 +246,39 @@ SET( zypp_base_HEADERS
   base/Functional.h
   base/Gettext.h
   base/GzStream.h
+  base/Hash.h
   base/IOStream.h
   base/InputStream.h
+  base/Iterable.h
   base/Iterator.h
+  base/Json.h
   base/LogControl.h
   base/LogTools.h
   base/Logger.h
   base/Measure.h
+  base/NamedValue.h
   base/NonCopyable.h
   base/ProfilingFormater.h
   base/ProvideNumericId.h
   base/PtrTypes.h
   base/ReferenceCounted.h
-  base/SafeBool.h
+  base/SetRelationMixin.h
+  base/SetTracker.h
+  base/Signal.h
   base/String.h
+  base/StrMatcher.h
   base/Regex.h
   base/Sysconfig.h
-  base/Tr1hash.h
+  base/TypeTraits.h
   base/Unit.h
+  base/ValueTransform.h
   base/WatchFile.h
+  base/Xml.h
 )
 
 INSTALL(  FILES
   ${zypp_base_HEADERS}
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/base
+  DESTINATION ${INCLUDE_INSTALL_DIR}/zypp/base
 )
 
 SET( zypp_media_SRCS
@@ -259,12 +290,12 @@ SET( zypp_media_SRCS
   media/MediaCD.cc
   media/MediaDIR.cc
   media/MediaDISK.cc
-  media/MediaSMB.cc
   media/MediaCIFS.cc
   media/ProxyInfo.cc
   media/MediaCurl.cc
-  media/MediaAria2c.cc
+  media/MediaMultiCurl.cc
   media/MediaISO.cc
+  media/MediaPlugin.cc
   media/MediaSource.cc
   media/MediaManager.cc
   media/MediaUserAuth.cc
@@ -273,6 +304,10 @@ SET( zypp_media_SRCS
   media/CurlConfig.cc
   media/TransferSettings.cc
   media/MediaPriority.cc
+  media/MetaLinkParser.cc
+  media/ZsyncParser.cc
+  media/MediaBlockList.cc
+  media/UrlResolverPlugin.cc
 )
 
 SET( zypp_media_HEADERS
@@ -280,15 +315,15 @@ SET( zypp_media_HEADERS
   media/MediaCD.h
   media/MediaCIFS.h
   media/MediaCurl.h
-  media/MediaAria2c.h
+  media/MediaMultiCurl.h
   media/MediaDIR.h
   media/MediaDISK.h
   media/MediaException.h
   media/MediaHandler.h
   media/MediaISO.h
+  media/MediaPlugin.h
   media/MediaManager.h
   media/MediaNFS.h
-  media/MediaSMB.h
   media/MediaSource.h
   media/MediaUserAuth.h
   media/Mount.h
@@ -298,26 +333,37 @@ SET( zypp_media_HEADERS
   media/CurlConfig.h
   media/TransferSettings.h
   media/MediaPriority.h
+  media/MetaLinkParser.h
+  media/ZsyncParser.h
+  media/MediaBlockList.h
+  media/UrlResolverPlugin.h
 )
 
 INSTALL(  FILES
   ${zypp_media_HEADERS}
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/media
+  DESTINATION ${INCLUDE_INSTALL_DIR}/zypp/media
 )
 
+IF ( LIBPROXY_FOUND )
+  SET(zypp_media_proxyinfo_libproxy_SRCS media/proxyinfo/ProxyInfoLibproxy.cc)
+  SET(zypp_media_proxyinfo_libproxy_HEADERS media/proxyinfo/ProxyInfoLibproxy.h)
+ENDIF( LIBPROXY_FOUND )
+
 SET( zypp_media_proxyinfo_SRCS
   media/proxyinfo/ProxyInfoSysconfig.cc
+  ${zypp_media_proxyinfo_libproxy_SRCS}
 )
 
 SET( zypp_media_proxyinfo_HEADERS
   media/proxyinfo/ProxyInfoImpl.h
   media/proxyinfo/ProxyInfoSysconfig.h
+  ${zypp_media_proxyinfo_libproxy_HEADERS}
   media/proxyinfo/ProxyInfos.h
 )
 
 INSTALL(  FILES
   ${zypp_media_proxyinfo_HEADERS}
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/media/proxyinfo
+  DESTINATION ${INCLUDE_INSTALL_DIR}/zypp/media/proxyinfo
 )
 
 SET( zypp_parser_SRCS
@@ -338,7 +384,6 @@ SET( zypp_parser_HEADERS
   parser/HistoryLogReader.h
   parser/ParserProgress.h
   parser/RepoFileReader.h
-  parser/xml_escape_parser.hpp
   parser/RepoindexFileReader.h
   parser/ServiceFileReader.h
   parser/ProductFileReader.h
@@ -346,7 +391,7 @@ SET( zypp_parser_HEADERS
 
 INSTALL(  FILES
   ${zypp_parser_HEADERS}
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/parser
+  DESTINATION ${INCLUDE_INSTALL_DIR}/zypp/parser
 )
 
 SET( zypp_parser_susetags_SRCS
@@ -361,20 +406,7 @@ SET( zypp_parser_susetags_HEADERS
 
 INSTALL(  FILES
   ${zypp_parser_susetags_HEADERS}
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/parser/susetags
-)
-
-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
+  DESTINATION ${INCLUDE_INSTALL_DIR}/zypp/parser/susetags
 )
 
 SET( zypp_parser_xml_SRCS
@@ -383,9 +415,9 @@ SET( zypp_parser_xml_SRCS
   parser/xml/ParseDefConsume.cc
   parser/xml/ParseDefException.cc
   parser/xml/Reader.cc
+  parser/xml/XmlEscape.cc
   parser/xml/XmlString.cc
   parser/xml/libxmlfwd.cc
-  parser/xml/xml_escape_parser.cpp
 )
 
 SET( zypp_parser_xml_HEADERS
@@ -399,12 +431,11 @@ SET( zypp_parser_xml_HEADERS
   parser/xml/XmlEscape.h
   parser/xml/XmlString.h
   parser/xml/libxmlfwd.h
-  parser/xml/xml_escape_parser.hpp
 )
 
 INSTALL(  FILES
   ${zypp_parser_xml_HEADERS}
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/parser/xml
+  DESTINATION ${INCLUDE_INSTALL_DIR}/zypp/parser/xml
 )
 
 SET( zypp_parser_yum_SRCS
@@ -419,7 +450,7 @@ SET( zypp_parser_yum_HEADERS
 
 INSTALL(  FILES
   ${zypp_parser_yum_HEADERS}
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/parser/yum
+  DESTINATION ${INCLUDE_INSTALL_DIR}/zypp/parser/yum
 )
 
 SET( zypp_parser_ws_SRCS
@@ -432,18 +463,16 @@ SET( zypp_parser_ws_HEADERS
 
 INSTALL(  FILES
   ${zypp_parser_ws_HEADERS}
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/parser/ws
+  DESTINATION ${INCLUDE_INSTALL_DIR}/zypp/parser/ws
 )
 
 
 SET( zypp_pool_SRCS
-  pool/GetResolvablesToInsDel.cc
   pool/PoolImpl.cc
   pool/PoolStats.cc
 )
 
 SET( zypp_pool_HEADERS
-  pool/GetResolvablesToInsDel.h
   pool/PoolImpl.h
   pool/PoolStats.h
   pool/PoolTraits.h
@@ -452,17 +481,13 @@ SET( zypp_pool_HEADERS
 
 INSTALL(  FILES
   ${zypp_pool_HEADERS}
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/pool
+  DESTINATION ${INCLUDE_INSTALL_DIR}/zypp/pool
 )
 
 SET( zypp_solver_detail_SRCS
-  solver/detail/Helper.cc
-  solver/detail/InstallOrder.cc
   solver/detail/ProblemSolutionIgnore.cc
   solver/detail/ProblemSolutionCombi.cc
   solver/detail/Resolver.cc
-  solver/detail/ResolverUpgrade.cc
-  solver/detail/Resolver_problems.cc
   solver/detail/SolutionAction.cc
   solver/detail/Testcase.cc
   solver/detail/SolverQueueItem.cc
@@ -476,8 +501,6 @@ SET( zypp_solver_detail_SRCS
 )
 
 SET( zypp_solver_detail_HEADERS
-  solver/detail/Helper.h
-  solver/detail/InstallOrder.h
   solver/detail/ProblemSolutionIgnore.h
   solver/detail/ProblemSolutionCombi.h
   solver/detail/Resolver.h
@@ -490,13 +513,14 @@ SET( zypp_solver_detail_HEADERS
   solver/detail/SolverQueueItemUpdate.h
   solver/detail/SolverQueueItemInstallOneOf.h
   solver/detail/SolverQueueItemLock.h
+  solver/detail/ItemCapKind.h
   solver/detail/SATResolver.h
   solver/detail/SystemCheck.h
 )
 
 INSTALL(  FILES
   ${zypp_solver_detail_HEADERS}
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/solver/detail
+  DESTINATION ${INCLUDE_INSTALL_DIR}/zypp/solver/detail
 )
 
 SET( zypp_sat_SRCS
@@ -504,31 +528,38 @@ SET( zypp_sat_SRCS
   sat/Solvable.cc
   sat/SolvableSet.cc
   sat/SolvIterMixin.cc
+  sat/Map.cc
+  sat/Queue.cc
+  sat/FileConflicts.cc
+  sat/Transaction.cc
   sat/WhatProvides.cc
   sat/WhatObsoletes.cc
   sat/LocaleSupport.cc
   sat/LookupAttr.cc
   sat/SolvAttr.cc
-  sat/AttrMatcher.cc
 )
 
 SET( zypp_sat_HEADERS
   sat/Pool.h
   sat/Solvable.h
   sat/SolvableSet.h
+  sat/SolvableType.h
   sat/SolvIterMixin.h
+  sat/Map.h
+  sat/Queue.h
+  sat/FileConflicts.h
+  sat/Transaction.h
   sat/WhatProvides.h
   sat/WhatObsoletes.h
   sat/LocaleSupport.h
   sat/LookupAttr.h
   sat/LookupAttrTools.h
   sat/SolvAttr.h
-  sat/AttrMatcher.h
 )
 
 INSTALL(  FILES
   ${zypp_sat_HEADERS}
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/sat
+  DESTINATION ${INCLUDE_INSTALL_DIR}/zypp/sat
 )
 
 SET( zypp_sat_detail_SRCS
@@ -542,13 +573,14 @@ SET( zypp_sat_detail_HEADERS
 
 INSTALL(  FILES
   ${zypp_sat_detail_HEADERS}
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/sat/detail
+  DESTINATION ${INCLUDE_INSTALL_DIR}/zypp/sat/detail
 )
 
 
 SET( zypp_target_SRCS
+  target/RpmPostTransCollector.cc
   target/RequestedLocalesFile.cc
-  target/SoftLocksFile.cc
+  target/SolvIdentFile.cc
   target/HardLocksFile.cc
   target/CommitPackageCache.cc
   target/CommitPackageCacheImpl.cc
@@ -556,11 +588,14 @@ SET( zypp_target_SRCS
   target/TargetCallbackReceiver.cc
   target/TargetException.cc
   target/TargetImpl.cc
+  target/TargetImpl.commitFindFileConflicts.cc
+
 )
 
 SET( zypp_target_HEADERS
+  target/RpmPostTransCollector.h
   target/RequestedLocalesFile.h
-  target/SoftLocksFile.h
+  target/SolvIdentFile.h
   target/HardLocksFile.h
   target/CommitPackageCache.h
   target/CommitPackageCacheImpl.h
@@ -572,22 +607,21 @@ SET( zypp_target_HEADERS
 
 INSTALL(  FILES
   ${zypp_target_HEADERS}
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/target
+  DESTINATION ${INCLUDE_INSTALL_DIR}/zypp/target
 )
 
+IF(NOT UDEV_FOUND)
+IF(HAL_FOUND)
 SET( zypp_target_hal_SRCS
   target/hal/HalContext.cc
 )
-
 SET( zypp_target_hal_HEADERS
   target/hal/HalContext.h
   target/hal/HalException.h
 )
-
-INSTALL(  FILES
-  ${zypp_target_hal_HEADERS}
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/target/hal
-)
+ENDIF(HAL_FOUND)
+ENDIF(NOT UDEV_FOUND)
+# as HAL is deprecated, we don't install headers
 
 SET( zypp_target_modalias_SRCS
   target/modalias/Modalias.cc
@@ -599,7 +633,7 @@ SET( zypp_target_modalias_HEADERS
 
 INSTALL(  FILES
   ${zypp_target_modalias_HEADERS}
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/target/modalias
+  DESTINATION ${INCLUDE_INSTALL_DIR}/zypp/target/modalias
 )
 
 SET( zypp_target_rpm_SRCS
@@ -625,7 +659,7 @@ SET( zypp_target_rpm_HEADERS
 
 INSTALL(  FILES
   ${zypp_target_rpm_HEADERS}
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/target/rpm
+  DESTINATION ${INCLUDE_INSTALL_DIR}/zypp/target/rpm
 )
 
 SET( zypp_thread_SRCS
@@ -641,7 +675,7 @@ SET( zypp_thread_HEADERS
 
 INSTALL(  FILES
   ${zypp_thread_HEADERS}
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/thread
+  DESTINATION ${INCLUDE_INSTALL_DIR}/zypp/thread
 )
 
 SET( zypp_ui_SRCS
@@ -662,7 +696,7 @@ SET( zypp_ui_HEADERS
 
 INSTALL(  FILES
   ${zypp_ui_HEADERS}
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/ui
+  DESTINATION ${INCLUDE_INSTALL_DIR}/zypp/ui
 )
 
 SET( zypp_url_SRCS
@@ -678,7 +712,7 @@ SET( zypp_url_HEADERS
 
 INSTALL(  FILES
   ${zypp_url_HEADERS}
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/url
+  DESTINATION ${INCLUDE_INSTALL_DIR}/zypp/url
 )
 
 SET( zypp_zypp_detail_SRCS
@@ -692,11 +726,12 @@ SET( zypp_zypp_detail_HEADERS
 
 INSTALL(  FILES
   ${zypp_zypp_detail_HEADERS}
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/zypp_detail
+  DESTINATION ${INCLUDE_INSTALL_DIR}/zypp/zypp_detail
 )
 
 SET( zypp_repo_SRCS
   repo/RepoException.cc
+  repo/RepoMirrorList.cc
   repo/RepoType.cc
   repo/ServiceType.cc
   repo/PackageProvider.cc
@@ -710,10 +745,13 @@ SET( zypp_repo_SRCS
   repo/Downloader.cc
   repo/RepoVariables.cc
   repo/RepoInfoBase.cc
+  repo/PluginServices.cc
+  repo/ServiceRepos.cc
 )
 
 SET( zypp_repo_HEADERS
   repo/RepoException.h
+  repo/RepoMirrorList.h
   repo/RepoType.h
   repo/ServiceType.h
   repo/PackageProvider.h
@@ -727,12 +765,13 @@ SET( zypp_repo_HEADERS
   repo/Downloader.h
   repo/RepoVariables.h
   repo/RepoInfoBase.h
-  repo/RepoInfoBaseImpl.h
+  repo/PluginServices.h
+  repo/ServiceRepos.h
 )
 
 INSTALL( FILES
   ${zypp_repo_HEADERS}
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/repo
+  DESTINATION ${INCLUDE_INSTALL_DIR}/zypp/repo
 )
 
 SET( zypp_repo_yum_SRCS
@@ -761,13 +800,32 @@ SET( zypp_ws_HEADERS
   ws/WebpinResult.h
 )
 
+####################################################################
+
+SET( zypp_misc_HEADERS
+  Misc.h
+  misc/DefaultLoadSystem.h
+  misc/CheckAccessDeleted.h
+)
+
+SET( zypp_misc_SRCS
+  misc/DefaultLoadSystem.cc
+  misc/CheckAccessDeleted.cc
+)
+
+INSTALL( FILES
+  ${zypp_misc_HEADERS}
+  DESTINATION ${INCLUDE_INSTALL_DIR}/zypp/misc
+)
+
+####################################################################
 
 SET( zypp_lib_SRCS
+${zypp_misc_SRCS}
 ${zypp_pool_SRCS}
 ${zypp_parser_susetags_SRCS}
 ${zypp_parser_xml_SRCS}
 ${zypp_parser_yum_SRCS}
-${zypp_parser_plaindir_SRCS}
 ${zypp_parser_ws_SRCS}
 ${zypp_parser_SRCS}
 ${zypp_media_proxyinfo_SRCS}
@@ -798,13 +856,11 @@ ${zypp_target_rpm_HEADERS}
 ${zypp_parser_tagfile_HEADERS}
 ${zypp_parser_susetags_HEADERS}
 ${zypp_parser_yum_HEADERS}
-${zypp_parser_plaindir_HEADERS}
 ${zypp_parser_xml_HEADERS}
 ${zypp_parser_ws_HEADERS}
 ${zypp_parser_HEADERS}
 ${zypp_ui_HEADERS}
 ${zypp_media_HEADERS}
-${zypp_target_hal_HEADERS}
 ${zypp_media_proxyinfo_HEADERS}
 ${zypp_base_HEADERS}
 ${zypp_solver_detail_HEADERS}
@@ -820,6 +876,7 @@ ${zypp_source_susetags_HEADERS}
 ${zypp_target_modalias_HEADERS}
 ${zypp_target_HEADERS}
 ${zypp_pool_HEADERS}
+${zypp_misc_HEADERS}
 )
 
 #
@@ -837,13 +894,12 @@ ENDMACRO( SET_LOGGROUP )
 SET_LOGGROUP( "zypp" ${zypp_lib_SRCS} )
 
 # override some defaults
-SET_LOGGROUP( "satsolver" ${zypp_sat_SRCS} )
+SET_LOGGROUP( "libsolv" ${zypp_sat_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_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} )
@@ -866,26 +922,30 @@ SET_LOGGROUP( "satsolver" ${zypp_sat_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}" )
-SET_TARGET_PROPERTIES( zypp PROPERTIES LINK_FLAGS "--as-needed" )
-ADD_DEPENDENCIES(zypp schema_header)
+SET (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/libzypp.map")
 # System libraries
 SET(UTIL_LIBRARY util)
-#SET(SIGNALS_LIBRARY boost_signals)
-SET(SIGNALS_LIBRARY boost_signals-mt)
 TARGET_LINK_LIBRARIES(zypp ${UTIL_LIBRARY} )
-TARGET_LINK_LIBRARIES(zypp ${DBUS_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 ${CURL_LIBRARIES} )
+TARGET_LINK_LIBRARIES(zypp ${LIBXML2_LIBRARIES} )
 TARGET_LINK_LIBRARIES(zypp ${ZLIB_LIBRARY} )
-TARGET_LINK_LIBRARIES(zypp ${SATSOLVER_LIBRARY} ${SATSOLVER_EXT_LIBRARY} ${EXPAT_LIBRARY})
+TARGET_LINK_LIBRARIES(zypp ${LibSolv_LIBRARIES} ${EXPAT_LIBRARY})
 TARGET_LINK_LIBRARIES(zypp ${OPENSSL_LIBRARIES} )
 TARGET_LINK_LIBRARIES(zypp ${CRYPTO_LIBRARIES} )
 TARGET_LINK_LIBRARIES(zypp ${SIGNALS_LIBRARY} )
 
+IF ( UDEV_FOUND )
+  TARGET_LINK_LIBRARIES(zypp ${UDEV_LIBRARY} )
+ELSE ( UDEV_FOUND )
+  IF ( HAL_FOUND )
+    TARGET_LINK_LIBRARIES(zypp ${HAL_LIBRARY} ${HAL_STORAGE_LIBRARY} ${DBUS_LIBRARY} )
+  ENDIF ( HAL_FOUND )
+ENDIF ( UDEV_FOUND )
+
+TARGET_LINK_LIBRARIES(zypp ${LIBPROXY_LIBRARIES} )
+
 INSTALL(TARGETS zypp LIBRARY DESTINATION ${LIB_INSTALL_DIR} )
 
 # install XML schemas