Merge lp:~zorba-coders/zorba/schema-tools-module-installers into lp:zorba/schema-tools-module

Proposed by Juan Zacarias
Status: Merged
Approved by: Juan Zacarias
Approved revision: 32
Merged at revision: 32
Proposed branch: lp:~zorba-coders/zorba/schema-tools-module-installers
Merge into: lp:zorba/schema-tools-module
Diff against target: 48 lines (+10/-3)
1 file modified
cmake_modules/FindJNI.cmake (+10/-3)
To merge this branch: bzr merge lp:~zorba-coders/zorba/schema-tools-module-installers
Reviewer Review Type Date Requested Status
Juan Zacarias Approve
Chris Hillery Approve
Review via email: mp+117537@code.launchpad.net

Commit message

Changes in FindJNI.cmake to work with the Ubuntu Installers

To post a comment you must log in.
Revision history for this message
Chris Hillery (ceejatec) wrote :

We need to consolidate this all into the util-jvm module, I think, but for now this is fine.

review: Approve
Revision history for this message
Juan Zacarias (juan457) :
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 schema-tools-module-installers-2012-08-04T01-50-48.535Z 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 'cmake_modules/FindJNI.cmake'
2--- cmake_modules/FindJNI.cmake 2012-01-25 21:17:14 +0000
3+++ cmake_modules/FindJNI.cmake 2012-07-31 22:25:24 +0000
4@@ -101,6 +101,12 @@
5 ${_JAVA_HOME}/jre/lib
6 ${_JAVA_HOME}/lib
7 ${_JAVA_HOME}
8+ /usr/lib/jvm/java-6-openjdk/jre/lib
9+ /usr/lib/jvm/java-6-openjdk-i386/jre/lib
10+ /usr/lib/jvm/java-6-openjdk-amd64/jre/lib
11+ /usr/lib/jvm/java-6-openjdk/jre/lib/{libarch}
12+ /usr/lib/jvm/java-6-openjdk-i386/jre/lib/{libarch}
13+ /usr/lib/jvm/java-6-openjdk-amd64/jre/lib/{libarch}
14 /usr/lib
15 /usr/local/lib
16 /usr/lib/jvm/java/lib
17@@ -113,7 +119,6 @@
18 /usr/lib/jvm/java-6-sun/jre/lib/{libarch}
19 /usr/lib/jvm/java-1.5.0-sun/jre/lib/{libarch}
20 /usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/{libarch} # can this one be removed according to #8821 ? Alex
21- /usr/lib/jvm/java-6-openjdk/jre/lib/{libarch}
22 /usr/lib/jvm/java-openjdk/jre/lib/{libarch}
23 # Debian specific paths for default JVM
24 /usr/lib/jvm/default-java/jre/lib/{libarch}
25@@ -137,6 +142,9 @@
26 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
27 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include"
28 ${_JAVA_HOME}/include
29+ /usr/lib/jvm/java-6-openjdk/include
30+ /usr/lib/jvm/java-6-openjdk-amd64/include
31+ /usr/lib/jvm/java-6-openjdk-i386/include
32 /usr/include
33 /usr/local/include
34 /usr/lib/java/include
35@@ -233,6 +241,7 @@
36 ${JAVA_INCLUDE_PATH}
37 )
38
39+
40 IF (APPLE)
41 # On Mac, the java headers files are broken symlinks if the Apple Developer Tools for Java are not installed
42 EXECUTE_PROCESS(COMMAND cat ${JAVA_INCLUDE_PATH}/jni.h
43@@ -275,5 +284,3 @@
44 SET(JNI_LIBRARIES "")
45 SET(JNI_INCLUDE_DIRS "")
46 ENDIF (JAVA_AWT_LIBRARY AND JAVA_JVM_LIBRARY AND JAVA_INCLUDE_PATH AND JAVA_INCLUDE_PATH2 AND JAVA_AWT_INCLUDE_PATH)
47-
48-

Subscribers

People subscribed via source and target branches

to all changes: