Merge lp:~zorba-coders/zorba/bug-990587-data-formatting into lp:zorba/data-formatting-module

[Chris Hillery]

Report gracefully if util-jvm module is not found.

[Chris Hillery (ceejatec)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-990587-data-formatting-2012-04-30T10-02-42.29Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-990587-data-formatting-2012-04-30T10-02-42.29Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Approve, 1 Pending.

[Nicolae Brinza (nbrinza)]

Tested it and it works.

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-990587-data-formatting-2012-04-30T16-03-35.505Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/bug-990587-data-formatting into lp:zorba/data-formatting-module failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job bug-990587-data-formatting-2012-04-30T16-03-35.505Z is
  finished. The final status was:

  2 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-990587-data-formatting-2012-05-01T00-21-37.286Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-990587-data-formatting-2012-05-01T00-21-37.286Z is finished. The final status was:

All tests succeeded!

=== 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 ********")