[Opensync-commits] r5279 - branches/3rd-party-cmake-modules/modules

[<svn...@op...>]

Author: bricks
Date: Mon Mar  2 14:10:56 2009
New Revision: 5279
URL: http://www.opensync.org/changeset/5279

Log:
added support for min version in cmake libcheck module

Modified:
   branches/3rd-party-cmake-modules/modules/FindCheck.cmake

Modified: branches/3rd-party-cmake-modules/modules/FindCheck.cmake
==============================================================================
--- branches/3rd-party-cmake-modules/modules/FindCheck.cmake	Thu Feb 26 09:03:38 2009	(r5278)
+++ branches/3rd-party-cmake-modules/modules/FindCheck.cmake	Mon Mar  2 14:10:56 2009	(r5279)
@@ -6,7 +6,7 @@
 #  CHECK_LIBRARIES - check library
 #  
 #  Copyright (c) 2007 Daniel Gollub <dg...@su...>
-#  Copyright (c) 2007 Bjoern Ricks  <b....@fh...>
+#  Copyright (c) 2007-2009 Bjoern Ricks  <bjo...@gm...>
 #
 #  Redistribution and use is allowed according to the terms of the New
 #  BSD license.
@@ -15,11 +15,20 @@
 
 INCLUDE( FindPkgConfig )
 
-# Take care about check.pc settings
-PKG_SEARCH_MODULE( CHECK check )
+IF ( Check_FIND_REQUIRED )
+	SET( _pkgconfig_REQUIRED "REQUIRED" )
+ELSE( Check_FIND_REQUIRED )
+	SET( _pkgconfig_REQUIRED "" )	
+ENDIF ( Check_FIND_REQUIRED )
+
+IF ( CHECK_MIN_VERSION )
+	PKG_SEARCH_MODULE( CHECK ${_pkgconfig_REQUIRED} check>=${CHECK_MIN_VERSION} )
+ELSE ( CHECK_MIN_VERSION )
+	PKG_SEARCH_MODULE( CHECK ${_pkgconfig_REQUIRED} check )
+ENDIF ( CHECK_MIN_VERSION )
 
 # Look for CHECK include dir and libraries
-IF( NOT CHECK_FOUND )
+IF( NOT CHECK_FOUND AND NOT PKG_CONFIG_FOUND )
 
 	FIND_PATH( CHECK_INCLUDE_DIRS check.h )
 
@@ -39,7 +48,7 @@
 			ENDIF ( NOT Check_FIND_QUIETLY )
 		ENDIF ( Check_FIND_REQUIRED )
 	ENDIF ( CHECK_INCLUDE_DIRS AND CHECK_LIBRARIES )
-ENDIF( NOT CHECK_FOUND )
+ENDIF( NOT CHECK_FOUND AND NOT PKG_CONFIG_FOUND )
 
 # Hide advanced variables from CMake GUIs
 MARK_AS_ADVANCED( CHECK_INCLUDE_DIRS CHECK_LIBRARIES )