Zorba

Merge lp:~zorba-coders/zorba/data-formatting-find-java into lp:zorba/data-formatting-module

  1. data-formatting-find-java
  2. Merge into data-formatting-module
Proposed by Chris Hillery
Status: Merged
Approved by: Chris Hillery
Approved revision: 35
Merged at revision: 35
Proposed branch: lp:~zorba-coders/zorba/data-formatting-find-java
Merge into: lp:zorba/data-formatting-module
Diff against target: 23 lines (+5/-4)
1 file modified
CMakeLists.txt (+5/-4)
To merge this branch: bzr merge lp:~zorba-coders/zorba/data-formatting-find-java
Reviewer Review Type Date Requested Status
Chris Hillery Approve
Cezar Andrei Approve
Review via email: mp+108550@code.launchpad.net

Commit message

Don't depend on util-jvm to find Java for us; find it ourselves.

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

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/data-formatting-find-java-2012-06-04T21-18-40.481Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job data-formatting-find-java-2012-06-04T21-18-40.481Z 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-05-09 10:11:44 +0000
3+++ CMakeLists.txt 2012-06-04 11:49:19 +0000
4@@ -18,15 +18,16 @@
5
6 PROJECT (zorba_data-formatting_module)
7
8-
9-# The util-jvm tool finds Java and JNI, so all standard cached JAVA_
10-# variables will be set. util-jvm also caches Java_FOUND and JNI_FOUND
11-# for us.
12 FIND_PACKAGE (zorba_util-jvm_module QUIET)
13
14 IF (zorba_util-jvm_module_FOUND)
15 INCLUDE ("${zorba_util-jvm_module_USE_FILE}")
16
17+ FIND_PACKAGE(JNI)
18+ FIND_PACKAGE(Java)
19+ FIND_PACKAGE (Zorba REQUIRED HINTS "${ZORBA_BUILD_DIR}")
20+ INCLUDE ("${Zorba_USE_FILE}")
21+
22 IF (JNI_FOUND)
23 INCLUDE_DIRECTORIES (${zorba_util-jvm_module_INCLUDE_DIRS})
24

Subscribers

People subscribed via source and target branches

to all changes: