zorba-coders team mailing list archive
-
zorba-coders team
-
Mailing list archive
-
Message #10865
Re: [Merge] lp:~davidagraf/zorba/data-formatting-module-bug-989490 into lp:zorba/data-formatting-module
Review: Needs Information
Hello Chris. Unfortunately now :-(. Sorry. But before testing, I need to fix something else. I just saw this:
bzr diff -c 31
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2012-05-23 09:12:37 +0000
+++ CMakeLists.txt 2012-06-04 11:42:06 +0000
@@ -16,12 +16,14 @@
PROJECT (zorba_schema-tools_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)
+ 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})
This is not merged into the sausalito code yet. Therefore, I didn't recognize it. Why is this necessary? Can we somehow avoid this? If not, we need to do the tricks we are now doing in the util-jvm module here too :-(.
--
https://code.launchpad.net/~davidagraf/zorba/data-formatting-module-bug-989490/+merge/110273
Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-module.
References