Permalink
Browse files

- fix API

- use libzypp-devel FindZypp
  • Loading branch information...
dmacvicar committed Feb 26, 2007
1 parent 23ee427 commit 1d21eaf61b1a2fdd02a5abd79710b818111cccc6
Showing with 2 additions and 33 deletions.
  1. +2 −1 CMakeLists.txt
  2. +0 −28 cmake/modules/FindZypp.cmake
  3. +0 −4 src/dbsource/DbSources.cc
View
@@ -5,7 +5,8 @@ PROJECT(libzypp-zmd-backend)
####################################################################
# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
-SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules )
+SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
+SET(CMAKE_MODULE_PATH ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules ${CMAKE_MODULE_PATH})
INCLUDE(${CMAKE_SOURCE_DIR}/VERSION.cmake)
SET ( VERSION "${ZMD_VERSION}_${BACKEND_VERSION}" )
@@ -1,28 +0,0 @@
-
-if(ZYPP_INCLUDE_DIR AND ZYPP_LIBRARY)
- # Already in cache, be silent
- set(ZYPP_FIND_QUIETLY TRUE)
-endif(ZYPP_INCLUDE_DIR AND ZYPP_LIBRARY)
-
-set(ZYPP_LIBRARY)
-set(ZYPP_INCLUDE_DIR)
-
-FIND_PATH(ZYPP_INCLUDE_DIR zypp/ZYpp.h
- /usr/include
- /usr/local/include
-)
-
-FIND_LIBRARY(ZYPP_LIBRARY NAMES zypp
- PATHS
- /usr/lib
- /usr/local/lib
-)
-
-if(ZYPP_INCLUDE_DIR AND ZYPP_LIBRARY)
- MESSAGE( STATUS "ZYpp found: includes in ${ZYPP_INCLUDE_DIR}, library in ${ZYPP_LIBRARY}")
- set(ZYPP_FOUND TRUE)
-else(ZYPP_INCLUDE_DIR AND ZYPP_LIBRARY)
- MESSAGE( FATAL "ZYpp not found")
-endif(ZYPP_INCLUDE_DIR AND ZYPP_LIBRARY)
-
-MARK_AS_ADVANCED(ZYPP_INCLUDE_DIR ZYPP_LIBRARY)
@@ -75,8 +75,6 @@ DbSources::createDummy( const Url & url, const string & catalog )
DbSourceImpl *impl = new DbSourceImpl ();
impl->factoryCtor( mediaid, Pathname(), catalog, "", false, false );
impl->setId( catalog );
- impl->setZmdName( catalog );
- impl->setZmdDescription ( catalog );
impl->setPriority( 0 );
impl->setSubscribed( true );
@@ -232,8 +230,6 @@ DbSources::sources( bool zypp_restore, bool refresh )
impl->factoryCtor( mediaid, Pathname(), alias, "", false, false );
impl->setId( id );
impl->setUrl( url );
- impl->setZmdName( name );
- impl->setZmdDescription ( desc );
impl->setPriority( priority );
impl->setSubscribed( subscribed != 0 );

0 comments on commit 1d21eaf

Please sign in to comment.