Imported Upstream version 0.7.11

[platform/upstream/libsolv.git] / cmake / modules / FindCheck.cmake

diff --git a/cmake/modules/FindCheck.cmake b/cmake/modules/FindCheck.cmake
index bcc0e5b..8ed3739 100644 (file)
--- a/cmake/modules/FindCheck.cmake
+++ b/cmake/modules/FindCheck.cmake
@@ -1,33 +1,27 @@
 
+IF (CHECK_INCLUDE_DIR)
+  # Already in cache, be silent
+  SET(CHECK_FIND_QUIETLY TRUE)
+ENDIF (CHECK_INCLUDE_DIR)
+
 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)
+IF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.4)
+  # handle the QUIETLY and REQUIRED arguments and set CHECK_FOUND to TRUE if
+  # all listed variables are TRUE
+  INCLUDE(FindPackageHandleStandardArgs)
+
+  FIND_PACKAGE_HANDLE_STANDARD_ARGS(Check "Please install 'check' and 'check-devel' packages" CHECK_LIBRARY CHECK_INCLUDE_DIR)
+ENDIF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.4)
 
-# Report the results.
-IF(NOT CHECK_FOUND)
-  SET(CHECK_DIR_MESSAGE
-    "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)
-    IF(Check_FIND_REQUIRED)
-      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)
+IF(CHECK_FOUND)
+  SET( CHECK_LIBRARIES ${CHECK_LIBRARY} )
+ELSE(CHECK_FOUND)
+  SET( CHECK_LIBRARIES )
+ENDIF(CHECK_FOUND)
+
+MARK_AS_ADVANCED(CHECK_INCLUDE_DIR)
+MARK_AS_ADVANCED(CHECK_LIBRARY)