From bc5e12ac285b1cf680c7212dd42f5165c267fa7e Mon Sep 17 00:00:00 2001 From: Michael Andres Date: Fri, 12 Oct 2007 15:30:19 +0000 Subject: [PATCH] Add buildrequirement for libsatsolver --- CMakeLists.txt | 7 +++++++ cmake/modules/FindSatsolver.cmake | 30 ++++++++++++++++++++++++++++++ libzypp.spec.cmake | 2 +- 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 cmake/modules/FindSatsolver.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 6c319cd..8de9080 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -189,6 +189,13 @@ ELSE ( NOT ZLIB_FOUND) INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR}) ENDIF( NOT ZLIB_FOUND) +FIND_PACKAGE(Satsolver REQUIRED) +IF ( NOT SATSOLVER_FOUND ) + MESSAGE( FATAL_ERROR " libsatsolver not found" ) +ELSE ( NOT SATSOLVER_FOUND ) + INCLUDE_DIRECTORIES( ${SATSOLVER_INCLUDE_DIR} ) +ENDIF( NOT SATSOLVER_FOUND ) + FIND_PROGRAM( DOXYGEN doxygen ) IF ( NOT DOXYGEN ) MESSAGE( FATAL_ERROR "doxygen not found: install doxygen to build the documentation." ) diff --git a/cmake/modules/FindSatsolver.cmake b/cmake/modules/FindSatsolver.cmake new file mode 100644 index 0000000..e7ee174 --- /dev/null +++ b/cmake/modules/FindSatsolver.cmake @@ -0,0 +1,30 @@ + +if(SATSOLVER_INCLUDE_DIR AND SATSOLVER_LIBRARY) + # Already in cache, be silent + set(SATSOLVER_FIND_QUIETLY TRUE) +endif(SATSOLVER_INCLUDE_DIR AND SATSOLVER_LIBRARY) + +set(SATSOLVER_LIBRARY) +set(SATSOLVER_INCLUDE_DIR) + +FIND_PATH(SATSOLVER_INCLUDE_DIR satsolver/solvable.h + /usr/include + /usr/local/include +) + +FIND_LIBRARY(SATSOLVER_LIBRARY NAMES satsolver0 + PATHS + /usr/lib + /usr/local/lib +) + +if(SATSOLVER_INCLUDE_DIR AND SATSOLVER_LIBRARY) + MESSAGE( STATUS "satsolver found: includes in ${SATSOLVER_INCLUDE_DIR}, library in ${SATSOLVER_LIBRARY}") + set(SATSOLVER_FOUND TRUE) +else(SATSOLVER_INCLUDE_DIR AND SATSOLVER_LIBRARY) + MESSAGE( STATUS "** satsolver not found") + MESSAGE( STATUS "** install package libsatsolver-devel") + MESSAGE( STATUS "** (http://svn.opensuse.org/svn/zypp/trunk/sat-solver)") +endif(SATSOLVER_INCLUDE_DIR AND SATSOLVER_LIBRARY) + +MARK_AS_ADVANCED(SATSOLVER_INCLUDE_DIR SATSOLVER_LIBRARY) \ No newline at end of file diff --git a/libzypp.spec.cmake b/libzypp.spec.cmake index fdbf41a..b94e267 100644 --- a/libzypp.spec.cmake +++ b/libzypp.spec.cmake @@ -24,7 +24,7 @@ Prefix: /usr Provides: yast2-packagemanager Obsoletes: yast2-packagemanager BuildRequires: cmake -BuildRequires: sqlite sqlite-devel +BuildRequires: sqlite sqlite-devel libsatsolver-devel BuildRequires: boost-devel curl-devel dejagnu doxygen gcc-c++ graphviz hal-devel libxml2-devel rpm-devel gettext-devel BuildRequires: update-desktop-files Requires: gpg2 -- 2.7.4