Merge lp:~zorba-coders/zorba/build-util_jvm_module into lp:zorba/util-jvm-module

[Matthias Brantner]

also link against libzorba

also link against libzorba

[Matthias Brantner (matthias-brantner)]

review: Approve

[Chris Hillery (ceejatec)]

Hmm... doing it this way means that the util-jvm module can only be built as part of a Zorba build. It won't be buildable separately against a binary Zorba installation. That's *probably* OK, at least for now.

We also need to verify that this still works after you do a "make install" on a Mac. Matthias, can you check that?

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/build-util_jvm_module-2012-05-21T21-06-30.78Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/build-util_jvm_module into lp:zorba/util-jvm-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 build-util_jvm_module-2012-05-21T21-06-30.78Z is
  finished. The final status was:

  No tests were run - build or configure step must have failed.

  Not commiting changes.

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

[lp:~zorba-coders/zorba/build-util_jvm_module]

9. By Matthias Brantner on 2012-05-22

build fixes for os x

[Chris Hillery (ceejatec)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/build-util_jvm_module-2012-05-22T00-22-47.623Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job build-util_jvm_module-2012-05-22T00-22-47.623Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2012-05-18 10:36:07 +0000
+++ src/CMakeLists.txt	2012-05-22 00:20:24 +0000
@@ -33,10 +33,14 @@
 # The important stuff is the library, which we install in Zorba's
 # default lib directory.
 ADD_LIBRARY(util-jvm SHARED util-jvm.cpp JavaVMSingleton.cpp)
-TARGET_LINK_LIBRARIES(util-jvm "${JAVA_JVM_LIBRARY}")
+TARGET_LINK_LIBRARIES(util-jvm "${JAVA_JVM_LIBRARY}" zorba_${ZORBA_STORE_NAME})
 INSTALL(TARGETS util-jvm DESTINATION lib)
 
+# MAC OS X only property
+# this is required to make sure that the library has the correct install name after
+# installation such that dependent modules always find it
+SET_TARGET_PROPERTIES(util-jvm PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
+
 # Set this in the parent scope so it will be put into our Config.cmake file.
 # As with many other things, this doesn't work when the module is installed.
-GET_TARGET_PROPERTY(_lib_loc util-jvm LOCATION)
-SET(ZORBA_PROJECT_LIBRARIES "${_lib_loc}" PARENT_SCOPE)
+SET(ZORBA_PROJECT_LIBRARIES util-jvm PARENT_SCOPE)