zorba-coders team mailing list archive
-
zorba-coders team
-
Mailing list archive
-
Message #13141
[Merge] lp:~zorba-coders/zorba/util-jvm-module-bug1006311 into lp:zorba/util-jvm-module
Juan Zacarias has proposed merging lp:~zorba-coders/zorba/util-jvm-module-bug1006311 into lp:zorba/util-jvm-module.
Requested reviews:
Chris Hillery (ceejatec)
Related bugs:
Bug #1006311 in Zorba: "jvm.dll not found under Windows when using util-jvm"
https://bugs.launchpad.net/zorba/+bug/1006311
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/util-jvm-module-bug1006311/+merge/118647
--
https://code.launchpad.net/~zorba-coders/zorba/util-jvm-module-bug1006311/+merge/118647
Your team Zorba Coders is subscribed to branch lp:zorba/util-jvm-module.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2012-07-24 20:29:24 +0000
+++ CMakeLists.txt 2012-08-07 23:13:20 +0000
@@ -24,6 +24,11 @@
MESSAGE(STATUS "")
MESSAGE(STATUS "--- Module: util-jvm ---")
+ FIND_PACKAGE (Zorba REQUIRED HINTS "${ZORBA_BUILD_DIR}")
+ INCLUDE ("${Zorba_USE_FILE}")
+
+ SET_CMAKE_MODULE_PATH()
+
MESSAGE (STATUS "Looking for JNI")
ZORBA_FIND_JNI()
@@ -32,11 +37,6 @@
IF (JNI_FOUND)
SET (UTIL_JVM_VERSION 1.0)
-
- FIND_PACKAGE (Zorba REQUIRED HINTS "${ZORBA_BUILD_DIR}")
- INCLUDE ("${Zorba_USE_FILE}")
-
- SET_CMAKE_MODULE_PATH()
# Export this include directory by setting ZORBA_PROJECT_INCLUDE_DIRS
SET (ZORBA_PROJECT_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/include")
=== modified file 'cmake_modules/Windows/FindJNI.cmake'
--- cmake_modules/Windows/FindJNI.cmake 2012-07-02 10:52:42 +0000
+++ cmake_modules/Windows/FindJNI.cmake 2012-08-07 23:13:20 +0000
@@ -25,11 +25,11 @@
IF (EXISTS "${JAVA_JVM_LIBRARY_PATH}/../jre/bin/client")
SET (FOUND_LOCATION "${JAVA_JVM_LIBRARY_PATH}/../jre/bin/client")
# find the needed DLL's
- FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "jvm")
+ FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "jvm" SKIP_INSTALL)
ELSEIF (EXISTS "${JAVA_JVM_LIBRARY_PATH}/../jre/bin/server")
SET (FOUND_LOCATION "${JAVA_JVM_LIBRARY_PATH}/../jre/bin/server")
# find the needed DLL's
- FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "jvm")
+ FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "jvm" SKIP_INSTALL)
ELSE (EXISTS "${JAVA_JVM_LIBRARY_PATH}/../jre/bin/client")
MESSAGE (WARNING "Could not find the jvm.dll for the JVM library: ${JAVA_JVM_LIBRARY}. Please extend this module to find the jvm.dll somewhere in your JVM directory or make sure that jvm.dll is in the PATH.")
ENDIF (EXISTS "${JAVA_JVM_LIBRARY_PATH}/../jre/bin/client")
Follow ups