--- a/cmake/Modules/FindClanLib.cmake	Wed Nov 05 20:39:44 2008 +0000
+++ b/cmake/Modules/FindClanLib.cmake	Wed Nov 05 20:55:09 2008 +0000
@@ -22,8 +22,8 @@
 
 find_path(ClanLib_INCLUDE_DIR
   NAMES ClanLib/core.h
-  PATHS ${ClanLib_PKGCONF_INCLUDE_DIRS}
   PATH_SUFFIXES ClanLib-${ClanLib_VERSION}
+  HINTS ${ClanLib_PKGCONF_INCLUDE_DIRS}
 )
 
 # Extract the actual version number

--- a/cmake/Modules/LibFindMacros.cmake	Wed Nov 05 20:39:44 2008 +0000
+++ b/cmake/Modules/LibFindMacros.cmake	Wed Nov 05 20:55:09 2008 +0000
@@ -45,6 +45,7 @@
     foreach (i ${${PREFIX}_PROCESS_INCLUDES})
       if (${i})
         set (${PREFIX}_INCLUDE_DIRS ${${PREFIX}_INCLUDE_DIRS} ${${i}})
+        mark_as_advanced(${i})
       else (${i})
         set (${PREFIX}_FOUND FALSE)
       endif (${i})
@@ -54,6 +55,7 @@
     foreach (i ${${PREFIX}_PROCESS_LIBS})
       if (${i})
         set (${PREFIX}_LIBRARIES ${${PREFIX}_LIBRARIES} ${${i}})
+        mark_as_advanced(${i})
       else (${i})
         set (${PREFIX}_FOUND FALSE)
       endif (${i})
@@ -62,7 +64,7 @@
     # Print message and/or exit on fatal error
     if (${PREFIX}_FOUND)
       if (NOT ${PREFIX}_FIND_QUIETLY)
-        message (STATUS "Found ${PREFIX}")
+        message (STATUS "Found ${PREFIX} ${${PREFIX}_VERSION}")
       endif (NOT ${PREFIX}_FIND_QUIETLY)
     else (${PREFIX}_FOUND)
       if (${PREFIX}_FIND_REQUIRED)
@@ -75,3 +77,23 @@
   endif (NOT ${PREFIX}_FOUND)
 endmacro (libfind_process)
 
+macro(libfind_library PREFIX basename)
+  set(TMP "")
+  if(MSVC80)
+    set(TMP -vc80)
+  endif(MSVC80)
+  if(MSVC90)
+    set(TMP -vc90)
+  endif(MSVC90)
+  set(${PREFIX}_LIBNAMES ${basename}${TMP})
+  if(${ARGC} GREATER 2)
+    set(${PREFIX}_LIBNAMES ${basename}${TMP}-${ARGV2})
+    string(REGEX REPLACE "\\." "_" TMP ${${PREFIX}_LIBNAMES})
+    set(${PREFIX}_LIBNAMES ${${PREFIX}_LIBNAMES} ${TMP})
+  endif(${ARGC} GREATER 2)
+  find_library(${PREFIX}_LIBRARY
+    NAMES ${${PREFIX}_LIBNAMES}
+    PATHS ${${PREFIX}_PKGCONF_LIBRARY_DIRS}
+  )
+endmacro(libfind_library)
+