Author: dmacvicar Date: Fri Oct 17 10:56:03 2008 New Revision: 11386 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11386&view=rev Log: I should look really if something is packaged before importing it Added: trunk/sat-solver/cmake/modules/FindCheck.cmake Removed: trunk/sat-solver/tests/lib/CMakeLists.txt trunk/sat-solver/tests/lib/Makefile.am trunk/sat-solver/tests/lib/Makefile.in trunk/sat-solver/tests/lib/check.c trunk/sat-solver/tests/lib/check.h trunk/sat-solver/tests/lib/check.h.in trunk/sat-solver/tests/lib/check_error.c trunk/sat-solver/tests/lib/check_error.h trunk/sat-solver/tests/lib/check_impl.h trunk/sat-solver/tests/lib/check_list.c trunk/sat-solver/tests/lib/check_list.h trunk/sat-solver/tests/lib/check_log.c trunk/sat-solver/tests/lib/check_log.h trunk/sat-solver/tests/lib/check_msg.c trunk/sat-solver/tests/lib/check_msg.h trunk/sat-solver/tests/lib/check_pack.c trunk/sat-solver/tests/lib/check_pack.h trunk/sat-solver/tests/lib/check_print.c trunk/sat-solver/tests/lib/check_print.h trunk/sat-solver/tests/lib/check_run.c trunk/sat-solver/tests/lib/check_str.c trunk/sat-solver/tests/lib/check_str.h trunk/sat-solver/tests/lib/config.h.in Modified: trunk/sat-solver/package/libsatsolver.spec.in trunk/sat-solver/tests/CMakeLists.txt Added: trunk/sat-solver/cmake/modules/FindCheck.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/cmake/modules/FindCheck.cmake?rev=11386&view=auto ============================================================================== --- trunk/sat-solver/cmake/modules/FindCheck.cmake (added) +++ trunk/sat-solver/cmake/modules/FindCheck.cmake Fri Oct 17 10:56:03 2008 @@ -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) Modified: trunk/sat-solver/package/libsatsolver.spec.in URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/package/libsatsolver.spec.in?rev=11386&r1=11385&r2=11386&view=diff ============================================================================== --- trunk/sat-solver/package/libsatsolver.spec.in (original) +++ trunk/sat-solver/package/libsatsolver.spec.in Fri Oct 17 10:56:03 2008 @@ -22,6 +22,8 @@ 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 Modified: trunk/sat-solver/tests/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tests/CMakeLists.txt?rev=11386&r1=11385&r2=11386&view=diff ============================================================================== --- trunk/sat-solver/tests/CMakeLists.txt (original) +++ trunk/sat-solver/tests/CMakeLists.txt Fri Oct 17 10:56:03 2008 @@ -1,20 +1,19 @@ ENABLE_TESTING() # make check framework headers available # check.h is generated in build dir -INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/tests/lib) -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/tests/lib) + +FIND_PACKAGE(Check REQUIRED) MACRO(ADD_TESTS) FOREACH( loop_var ${ARGV} ) #SET_SOURCE_FILES_PROPERTIES( ${loop_var}_test.c "" ) ADD_EXECUTABLE( ${loop_var}_test ${loop_var}_test.c ) - TARGET_LINK_LIBRARIES( ${loop_var}_test check) + TARGET_LINK_LIBRARIES( ${loop_var}_test ${CHECK_LIBRARIES}) #MESSAGE( INFO "Adding test ${loop_var}_test ${CMAKE_CURRENT_BINARY_DIR}/${loop_var}_test") ADD_TEST( "${loop_var}_test" "${CMAKE_CURRENT_BINARY_DIR}/${loop_var}_test" ) ENDFOREACH( loop_var ) ENDMACRO(ADD_TESTS) -ADD_SUBDIRECTORY(lib) ADD_SUBDIRECTORY(core) ADD_SUBDIRECTORY(solver) #ADD_SUBDIRECTORY(tools) -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org