Mailinglist Archive: zypp-commit (339 mails)

[dmacvicar@xxxxxxxxxxxxxxxx]

Author: dmacvicar
Date: Fri Oct 17 11:10:18 2008
New Revision: 11389

URL: http://svn.opensuse.org/viewcvs/zypp?rev=11389&view=rev
Log:
fix finding the library

Modified:
    trunk/sat-solver/CMakeLists.txt
    trunk/sat-solver/cmake/modules/FindCheck.cmake
    trunk/sat-solver/tests/CMakeLists.txt

Modified: trunk/sat-solver/CMakeLists.txt
URL: 
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/CMakeLists.txt?rev=11389&r1=11388&r2=11389&view=diff
==============================================================================
--- trunk/sat-solver/CMakeLists.txt (original)
+++ trunk/sat-solver/CMakeLists.txt Fri Oct 17 11:10:18 2008
@@ -10,7 +10,6 @@
   cmake_policy(SET CMP0005 OLD)
 endif(COMMAND cmake_policy)
 
-
 # Library
 IF ( DEFINED LIB )
   SET ( LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${LIB}" )
@@ -33,6 +32,8 @@
 INCLUDE( ${CMAKE_SOURCE_DIR}/VERSION.cmake )
 
 FIND_PACKAGE(EXPAT REQUIRED)
+FIND_PACKAGE(Check REQUIRED)
+
 FIND_LIBRARY(RPMDB_LIBRARY NAMES rpmdb)
 FIND_LIBRARY(ZLIB_LIBRARY NAMES z)
 

Modified: trunk/sat-solver/cmake/modules/FindCheck.cmake
URL: 
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/cmake/modules/FindCheck.cmake?rev=11389&r1=11388&r2=11389&view=diff
==============================================================================
--- trunk/sat-solver/cmake/modules/FindCheck.cmake (original)
+++ trunk/sat-solver/cmake/modules/FindCheck.cmake Fri Oct 17 11:10:18 2008
@@ -20,7 +20,7 @@
 # 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.")
+    "check C unit testing library was not found. Install check and 
check-devel.")
   IF(NOT CHECK_FIND_QUIETLY)
     MESSAGE(STATUS "${CHECK_DIR_MESSAGE}")
   ELSE(NOT CHECK_FIND_QUIETLY)
@@ -28,4 +28,6 @@
       MESSAGE(FATAL_ERROR "${CHECK_DIR_MESSAGE}")
     ENDIF(CHECK_FIND_REQUIRED)
   ENDIF(NOT CHECK_FIND_QUIETLY)
+ELSE(NOT CHECK_FOUND)
+  MESSAGE(STATUS "check C unit testing library: ${CHECK_LIBRARIES}")
 ENDIF(NOT CHECK_FOUND)

Modified: trunk/sat-solver/tests/CMakeLists.txt
URL: 
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tests/CMakeLists.txt?rev=11389&r1=11388&r2=11389&view=diff
==============================================================================
--- trunk/sat-solver/tests/CMakeLists.txt (original)
+++ trunk/sat-solver/tests/CMakeLists.txt Fri Oct 17 11:10:18 2008
@@ -2,8 +2,6 @@
 # make check framework headers available
 # check.h is generated in build dir
 
-FIND_PACKAGE(Check REQUIRED)
-
 MACRO(ADD_TESTS)
   FOREACH( loop_var ${ARGV} )
     #SET_SOURCE_FILES_PROPERTIES( ${loop_var}_test.c "" )

--
To unsubscribe, e-mail: zypp-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: zypp-commit+help@xxxxxxxxxxxx