Merge lp:~zorba-coders/zorba/xmlbeans-home-search into lp:zorba/schema-tools-module

[Chris Hillery]

Use XMLBEANS_HOME from environment when looking for xmlbeans.jar.

[Chris Hillery (ceejatec)]

review: Approve

[William Candillon (wcandillon)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/xmlbeans-home-search-2012-05-23T09-29-44.512Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job xmlbeans-home-search-2012-05-23T09-29-44.512Z is finished. The final status was:

All tests succeeded!

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-04-30 09:56:55 +0000
+++ CMakeLists.txt	2012-05-23 09:15:22 +0000
@@ -25,15 +25,14 @@
   IF (JNI_FOUND)
     INCLUDE_DIRECTORIES (${zorba_util-jvm_module_INCLUDE_DIRS})
 
-    IF (WIN32)
-      SET (XMLBEANS_PATH $ENV{XMLBEANS_HOME}\\lib)
-      FIND_FILE( XMLBEANS_JAR NAMES xmlbeans.jar xbean.jar
-	PATHS ${XMLBEANS_PATH} )
-      MESSAGE (STATUS "xmlbeans.jar looking path: " ${XMLBEANS_PATH} )
-    ELSE (WIN32)
-      FIND_FILE( XMLBEANS_JAR NAMES xmlbeans.jar xbean.jar
-	PATHS /usr/share/java/ /usr/share/java/xmlbeans/ )
-    ENDIF (WIN32)
+    SET (XMLBEANS_PATHS)
+    IF (NOT WIN32)
+      SET (XMLBEANS_PATHS /usr/share/java /usr/share/java/xmlbeans)
+    ENDIF (NOT WIN32)
+    FIND_FILE(XMLBEANS_JAR NAMES xmlbeans.jar xbean.jar
+      PATHS "$ENV{XMLBEANS_HOME}" ${XMLBEANS_PATHS}
+      PATH_SUFFIXES lib build/lib)
+
     IF( EXISTS ${XMLBEANS_JAR} )
       
       MESSAGE (STATUS "xmlbeans.jar found at: " ${XMLBEANS_JAR} )