Merge lp:~zorba-coders/zorba/util-jvm-ctest-fix into lp:zorba/util-jvm-module

[Chris Hillery]

[Matthias Brantner (matthias-brantner)]

review: Approve

[Chris Hillery (ceejatec)]

review: Approve

[Chris Hillery (ceejatec)]

Actually, the changes here conflict with changes on the trunk. Since this proposal is from 7 months ago and as far as I know there are no outstanding problems with util-jvm, I'm going to assume this proposal is no longer desirable.

review: Disapprove

Unmerged revisions

13. By Chris Hillery on 2012-05-25

Force util-jvm library to build in same dir as libzorba.

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2012-05-22 00:15:11 +0000
+++ src/CMakeLists.txt	2012-05-25 21:40:25 +0000
@@ -34,6 +34,21 @@
 # default lib directory.
 ADD_LIBRARY(util-jvm SHARED util-jvm.cpp JavaVMSingleton.cpp)
 TARGET_LINK_LIBRARIES(util-jvm "${JAVA_JVM_LIBRARY}" zorba_${ZORBA_STORE_NAME})
+
+# Need to create the util-jvm shared library in the same directory as
+# libzorba. Since the libzorba target is created after modules are loaded,
+# we have to just assume it here. We also have to assume that we are
+# building as part of a Zorba build, but that actually is the only way
+# this "module" works anyway.
+# Shared libraries are considered RUNTIME targets on Win32
+# platforms and LIBRARY targets elsewhere.
+IF (WIN32)
+  SET (target_type RUNTIME)
+ELSE (WIN32)
+  SET (target_type LIBRARY)
+ENDIF (WIN32)
+SET_TARGET_PROPERTIES(util-jvm PROPERTIES
+  ${target_type}_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/src")
 INSTALL(TARGETS util-jvm DESTINATION lib)
 
 # MAC OS X only property