Merge lp:~zorba-coders/zorba/find-icu-version into lp:zorba

[Chris Hillery]

Set ICU_VERSION when finding ICU.

[Chris Hillery (ceejatec)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/find-icu-version-2012-04-24T01-24-59.02Z/log.html

[Paul J. Lucas (paul-lucas)]

Older ICU versions don't have the uvernum.h header -- they used to use (just) uversion.h. Hence, your patch won't work on older versions (including 3.8.1 which is what the remote queue machine is running) which kind of defeats the point.

Why not use the icu-config --version command?

[Chris Hillery (ceejatec)]

Well, that's annoying. The comment in uvernum.h said that the #define was "stable" since 2.4, but I guess that doesn't include the file it's defined in.

I didn't use icu-config because the existing FindICU.cmake doesn't find the executables, only the include files and libraries. I don't know enough about ICU to know whether there are any complications in finding the binaries as well (there's several things that are different about finding the data files on cygwin, for instance).

If you can tell me how to find icu-config reliably, I'll change it; otherwise I guess I'll try to read either uvernum.h or uversion.h.

[Zorba Build Bot (zorba-buildbot)]

Validation queue job find-icu-version-2012-04-24T01-24-59.02Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 2 Approve, 1 Pending.

[Paul J. Lucas (paul-lucas)]

I have no idea about finding the path to icu-config. I suppose try to read uvernum.h first -- if that fails, read uversion.h.

[Chris Hillery (ceejatec)]

Looking in either header file now.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/find-icu-version-2012-04-24T08-05-16.704Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job find-icu-version-2012-04-24T08-05-16.704Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 2 Approve, 1 Pending.

[Paul J. Lucas (paul-lucas)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/find-icu-version-2012-04-24T14-04-59.969Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job find-icu-version-2012-04-24T14-04-59.969Z is finished. The final status was:

All tests succeeded!

=== modified file 'cmake_modules/FindICU.cmake'
--- cmake_modules/FindICU.cmake	2012-04-23 10:46:38 +0000
+++ cmake_modules/FindICU.cmake	2012-04-24 08:05:23 +0000
@@ -51,6 +51,49 @@
   MESSAGE(STATUS "Could not find ICU library")
 endif (ICU_LIBRARY)
 
+# Discover the version.
+IF (NOT ICU_INCLUDE STREQUAL "")
+  # ICU 3.x has the relevant #defines in uversion.h; 4.x uses uvernum.h.
+  FIND_PATH(ICUVERHPPPATH NAMES unicode/uvernum.h unicode/uversion.h
+    PATHS ${ICU_INCLUDE} NO_DEFAULT_PATH)
+
+  IF ( ${ICUVERHPPPATH} STREQUAL ICUVERHPPPATH-NOTFOUND )
+    SET(ICU_VERSION "0")
+    MESSAGE(STATUS "Found ICU but unable to determine version - assuming version 0")
+  ELSE( ${ICUVERHPPPATH} STREQUAL ICUVERHPPPATH-NOTFOUND )
+    SET (ICUVERHPP)
+    # One of these files has to exist, or else ICUVERHPPPATH wouldn't be set.
+    # If uvernum.h exists, it has the data we want; otherwise, that data is
+    # in uversion.h.
+    FOREACH (header uvernum.h uversion.h)
+      SET (headerfile "${ICUVERHPPPATH}/unicode/${header}")
+      IF (EXISTS "${headerfile}")
+	FILE(READ "${headerfile}" ICUVERHPP)
+	BREAK()
+      ENDIF (EXISTS "${headerfile}")
+    ENDFOREACH (header)
+
+    STRING(REGEX MATCH "\n *#define U_ICU_VERSION_MAJOR_NUM +[0-9]+" ICUVERMAJ 
+      ${ICUVERHPP}) 
+    STRING(REGEX MATCH "\n *#define U_ICU_VERSION_MINOR_NUM +[0-9]+" ICUVERMIN 
+      ${ICUVERHPP})
+    STRING(REGEX
+      MATCH "\n *#define U_ICU_VERSION_PATCHLEVEL_NUM +[0-9]+" ICUVERPATCH 
+      ${ICUVERHPP})
+  
+    STRING(REGEX REPLACE "\n *#define U_ICU_VERSION_MAJOR_NUM +" "" 
+      ICUVERMAJ ${ICUVERMAJ})
+    STRING(REGEX REPLACE "\n *#define U_ICU_VERSION_MINOR_NUM +" "" 
+      ICUVERMIN ${ICUVERMIN})
+    STRING(REGEX REPLACE "\n *#define U_ICU_VERSION_PATCHLEVEL_NUM +" "" 
+      ICUVERPATCH ${ICUVERPATCH})
+  
+    SET(ICU_VERSION ${ICUVERMAJ}.${ICUVERMIN}.${ICUVERPATCH})
+    MESSAGE(STATUS "ICU Version: ${ICU_VERSION}")
+  
+  ENDIF ( ${ICUVERHPPPATH} STREQUAL ICUVERHPPPATH-NOTFOUND )
+ENDIF (NOT ICU_INCLUDE STREQUAL "")
+
 
 # Copy the results to the output variables.
 if(ICU_INCLUDE AND ICU_LIBRARY)
@@ -107,4 +150,5 @@
   set(ICU_I18N_LIBRARIES)
   set(ICU_DATA_LIBRARIES)
   set(ICU_INCLUDE_DIRS)
+  set(ICU_VERSION 0)
 endif(ICU_INCLUDE AND ICU_LIBRARY)