[sword-svn] r2760 - trunk/cmake

[greg.hellings at crosswire.org]

Author: greg.hellings
Date: 2013-01-04 15:07:54 -0700 (Fri, 04 Jan 2013)
New Revision: 2760

Modified:
   trunk/cmake/FindICU.cmake
Log:
Took hints from Ben's patch to set ICU_VERSION.

For some reason, setting the ICU_VERSION varaible in CMake fixes
the problems with UTF8Transliterator in utilities. This version
of the process does not rely on icu-config, however, which is
horribly broken.

Modified: trunk/cmake/FindICU.cmake
===================================================================
--- trunk/cmake/FindICU.cmake	2013-01-04 21:35:12 UTC (rev 2759)
+++ trunk/cmake/FindICU.cmake	2013-01-04 22:07:54 UTC (rev 2760)
@@ -23,6 +23,16 @@
   DOC "Libraries to link against for the common parts of ICU")
 mark_as_advanced(ICU_LIBRARY)
 
+find_program(
+  ICU_GENRB
+  NAMES genrb)
+
+find_package(PkgConfig)
+if(PKG_CONFIG_FOUND)
+	pkg_check_modules(ICU icu-uc)
+	MESSAGE(STATUS "ICU version: ${ICU_VERSION}")
+endif(PKG_CONFIG_FOUND)
+
 # Copy the results to the output variables.
 if(ICU_INCLUDE_DIR AND ICU_LIBRARY)
   set(ICU_FOUND 1)