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

Proposed by Chris Hillery
Status: Merged
Approved by: William Candillon
Approved revision: 30
Merged at revision: 30
Proposed branch: lp:~zorba-coders/zorba/xmlbeans-home-search
Merge into: lp:zorba/schema-tools-module
Diff against target: 27 lines (+8/-9)
1 file modified
CMakeLists.txt (+8/-9)
To merge this branch: bzr merge lp:~zorba-coders/zorba/xmlbeans-home-search
Reviewer Review Type Date Requested Status
William Candillon Approve
Chris Hillery Approve
Review via email: mp+106967@code.launchpad.net

Commit message

Use XMLBEANS_HOME from environment when looking for xmlbeans.jar.

To post a comment you must log in.
Revision history for this message
Chris Hillery (ceejatec) :
review: Approve
Revision history for this message
William Candillon (wcandillon) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

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

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2012-04-30 09:56:55 +0000
3+++ CMakeLists.txt 2012-05-23 09:15:22 +0000
4@@ -25,15 +25,14 @@
5 IF (JNI_FOUND)
6 INCLUDE_DIRECTORIES (${zorba_util-jvm_module_INCLUDE_DIRS})
7
8- IF (WIN32)
9- SET (XMLBEANS_PATH $ENV{XMLBEANS_HOME}\\lib)
10- FIND_FILE( XMLBEANS_JAR NAMES xmlbeans.jar xbean.jar
11- PATHS ${XMLBEANS_PATH} )
12- MESSAGE (STATUS "xmlbeans.jar looking path: " ${XMLBEANS_PATH} )
13- ELSE (WIN32)
14- FIND_FILE( XMLBEANS_JAR NAMES xmlbeans.jar xbean.jar
15- PATHS /usr/share/java/ /usr/share/java/xmlbeans/ )
16- ENDIF (WIN32)
17+ SET (XMLBEANS_PATHS)
18+ IF (NOT WIN32)
19+ SET (XMLBEANS_PATHS /usr/share/java /usr/share/java/xmlbeans)
20+ ENDIF (NOT WIN32)
21+ FIND_FILE(XMLBEANS_JAR NAMES xmlbeans.jar xbean.jar
22+ PATHS "$ENV{XMLBEANS_HOME}" ${XMLBEANS_PATHS}
23+ PATH_SUFFIXES lib build/lib)
24+
25 IF( EXISTS ${XMLBEANS_JAR} )
26
27 MESSAGE (STATUS "xmlbeans.jar found at: " ${XMLBEANS_JAR} )

Subscribers

People subscribed via source and target branches

to all changes: