From 0cc20c1a721a936dfb0e0eee4bb53acb76f9cb3a Mon Sep 17 00:00:00 2001 From: Duncan Mac-Vicar P Date: Fri, 17 Oct 2008 08:56:03 +0000 Subject: [PATCH] I should look really if something is packaged before importing it --- cmake/modules/FindCheck.cmake | 31 +++++++++++++++++++++++++++++++ package/libsatsolver.spec.in | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 cmake/modules/FindCheck.cmake diff --git a/cmake/modules/FindCheck.cmake b/cmake/modules/FindCheck.cmake new file mode 100644 index 0000000..62290f9 --- /dev/null +++ b/cmake/modules/FindCheck.cmake @@ -0,0 +1,31 @@ + +FIND_PATH(CHECK_INCLUDE_DIR NAMES check.h) +MARK_AS_ADVANCED(CHECK_INCLUDE_DIR) + +# Look for the library. +FIND_LIBRARY(CHECK_LIBRARY NAMES check) +MARK_AS_ADVANCED(CHECK_LIBRARY) + +# Copy the results to the output variables. +IF(CHECK_INCLUDE_DIR AND CHECK_LIBRARY) + SET(CHECK_FOUND 1) + SET(CHECK_LIBRARIES ${CHECK_LIBRARY}) + SET(CHECK_INCLUDE_DIRS ${CHECK_INCLUDE_DIR}) +ELSE(CHECK_INCLUDE_DIR AND CHECK_LIBRARY) + SET(CHECK_FOUND 0) + SET(CHECK_LIBRARIES) + SET(CHECK_INCLUDE_DIRS) +ENDIF(CHECK_INCLUDE_DIR AND CHECK_LIBRARY) + +# Report the results. +IF(NOT CHECK_FOUND) + SET(CHECK_DIR_MESSAGE + "CHECK was not found. Make sure CHECK_LIBRARY and CHECK_INCLUDE_DIR are set.") + IF(NOT CHECK_FIND_QUIETLY) + MESSAGE(STATUS "${CHECK_DIR_MESSAGE}") + ELSE(NOT CHECK_FIND_QUIETLY) + IF(CHECK_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "${CHECK_DIR_MESSAGE}") + ENDIF(CHECK_FIND_REQUIRED) + ENDIF(NOT CHECK_FIND_QUIETLY) +ENDIF(NOT CHECK_FOUND) diff --git a/package/libsatsolver.spec.in b/package/libsatsolver.spec.in index 70e2d69..a4b195e 100644 --- a/package/libsatsolver.spec.in +++ b/package/libsatsolver.spec.in @@ -22,6 +22,8 @@ BuildRequires: libexpat-devel BuildRequires: expat-devel %endif BuildRequires: cmake rpm-devel gcc-c++ ruby-devel swig perl python-devel +# the testsuite uses the check framework +BuildRequires: check Summary: A new approach to package dependency solving %description -- 2.7.4