Chris Hillery has proposed merging
lp:~zorba-coders/zorba/bug-990587-data-formatting into
lp:zorba/data-formatting-module.
Requested reviews:
Chris Hillery (ceejatec)
Nicolae Brinza (nbrinza)
Related bugs:
Bug #990587 in Zorba: "Zorba with modules does not build if only JRE is
installed (no javac or jar)"
https://bugs.launchpad.net/zorba/+bug/990587
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-990587-data-formatting/+merge/104077
--
https://code.launchpad.net/~zorba-coders/zorba/bug-990587-data-formatting/+merge/104077
Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-module.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2012-04-11 13:45:56 +0000
+++ CMakeLists.txt 2012-04-30 10:00:25 +0000
@@ -22,28 +22,32 @@
# 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 REQUIRED)
-
-IF (JNI_FOUND)
- INCLUDE_DIRECTORIES (${zorba_util-jvm_module_INCLUDE_DIRS})
-
- ENABLE_TESTING ()
- INCLUDE (CTest)
-
- SET_CMAKE_MODULE_PATH ()
-
- FIND_PACKAGE (Zorba REQUIRED HINTS "${ZORBA_BUILD_DIR}")
- INCLUDE ("${Zorba_USE_FILE}")
-
- ADD_SUBDIRECTORY ("src")
- #ADD_TEST_DIRECTORY ("${CMAKE_SOURCE_DIR}/test")
-
- DONE_DECLARING_ZORBA_URIS ()
-
-ELSE (JNI_FOUND)
- MESSAGE ( STATUS "Java and/or JNI not found; skipping data-formating module.")
-ENDIF(JNI_FOUND)
-
+FIND_PACKAGE (zorba_util-jvm_module QUIET)
+
+IF (zorba_util-jvm_module_FOUND)
+ IF (JNI_FOUND)
+ INCLUDE_DIRECTORIES (${zorba_util-jvm_module_INCLUDE_DIRS})
+
+ ENABLE_TESTING ()
+ INCLUDE (CTest)
+
+ SET_CMAKE_MODULE_PATH ()
+
+ FIND_PACKAGE (Zorba REQUIRED HINTS "${ZORBA_BUILD_DIR}")
+ INCLUDE ("${Zorba_USE_FILE}")
+
+ ADD_SUBDIRECTORY ("src")
+ #ADD_TEST_DIRECTORY ("${CMAKE_SOURCE_DIR}/test")
+
+ DONE_DECLARING_ZORBA_URIS ()
+
+ ELSE (JNI_FOUND)
+ MESSAGE ( STATUS "Java and/or JNI not found; skipping data-formating module.")
+ ENDIF(JNI_FOUND)
+
+ELSE (zorba_util-jvm_module_FOUND)
+ MESSAGE (STATUS "Zorba's util-jvm module not found; skipping data-formatting module.")
+ENDIF (zorba_util-jvm_module_FOUND)
MESSAGE (STATUS "******** END Configuring module Data-Formatting ********")
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
