zorba-coders team mailing list archive

[Chris Hillery <chillery+launchpad@xxxxxxxxx>]

Chris Hillery has proposed merging lp:~zorba-coders/zorba/data-formatting-find-java into lp:zorba/data-formatting-module.

Requested reviews:
  Zorba Coders (zorba-coders)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/data-formatting-find-java/+merge/108550
-- 
https://code.launchpad.net/~zorba-coders/zorba/data-formatting-find-java/+merge/108550
Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/data-formatting-find-java into lp:zorba/data-formatting-module.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-05-09 10:11:44 +0000
+++ CMakeLists.txt	2012-06-04 11:46:33 +0000
@@ -18,15 +18,16 @@
 
 PROJECT (zorba_data-formatting_module)
 
-
-# The util-jvm tool finds Java and JNI, so all standard cached JAVA_
-# variables will be set. util-jvm also caches Java_FOUND and JNI_FOUND
-# for us.
 FIND_PACKAGE (zorba_util-jvm_module QUIET)
 
 IF (zorba_util-jvm_module_FOUND)
   INCLUDE ("${zorba_util-jvm_module_USE_FILE}")
 
+  FIND_PACKAGE(JNI)
+  FIND_PACKAGE(Java)
+  FIND_PACKAGE (Zorba REQUIRED HINTS "${ZORBA_BUILD_DIR}")
+  INCLUDE ("${Zorba_USE_FILE}")
+
   IF (JNI_FOUND)
     INCLUDE_DIRECTORIES (${zorba_util-jvm_module_INCLUDE_DIRS})