Index: cmake/FindICU.cmake
===================================================================
--- cmake/FindICU.cmake	(revision 2751)
+++ cmake/FindICU.cmake	(working copy)
@@ -23,12 +23,30 @@
   DOC "Libraries to link against for the common parts of ICU")
 mark_as_advanced(ICU_LIBRARY)
 
+# Look for the genrb executable
+find_program(
+    GENRB
+    NAMES genrb)
+
+# Look for icu-config
+find_program(
+    ICU_CONFIG
+    NAMES icu-config)
+
 # Copy the results to the output variables.
 if(ICU_INCLUDE_DIR AND ICU_LIBRARY)
   set(ICU_FOUND 1)
   set(ICU_LIBRARIES ${ICU_LIBRARY})
   set(ICU_INCLUDE_DIRS ${ICU_INCLUDE_DIR})
+  set(ICU_GENRB ${GENRB})
 
+  #if we found icu-config, try to get the icu version
+  if (ICU_CONFIG)
+      execute_process(COMMAND ${ICU_CONFIG} --version
+            OUTPUT_VARIABLE ICU_VERSION
+            OUTPUT_STRIP_TRAILING_WHITESPACE)
+  endif (ICU_CONFIG)
+
   # Look for the ICU internationalization libraries
   find_library(
     ICU_I18N_LIBRARY