Zorba

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

  1. util-jvm-module-bug1006311
  2. Merge into module-util-jvm
Proposed by Juan Zacarias
Status: Merged
Approved by: Juan Zacarias
Approved revision: 14
Merged at revision: 16
Proposed branch: lp:~zorba-coders/zorba/util-jvm-module-bug1006311
Merge into: lp:zorba/util-jvm-module
Diff against target: 45 lines (+7/-7)
2 files modified
CMakeLists.txt (+5/-5)
cmake_modules/Windows/FindJNI.cmake (+2/-2)
To merge this branch: bzr merge lp:~zorba-coders/zorba/util-jvm-module-bug1006311
Reviewer Review Type Date Requested Status
Juan Zacarias Approve
Chris Hillery Approve
Review via email: mp+118647@code.launchpad.net

Commit message

Fix for bug 1006311
Changed CMakeLists.txt file to look first for zorba and then add the cmake_module directory correctly so the module takes into account looking for the jvm.dll

To post a comment you must log in.
Revision history for this message
Chris Hillery (ceejatec) :
review: Approve
Revision history for this message
Juan Zacarias (juan457) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/util-jvm-module-bug1006311-2012-09-20T19-15-44.132Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job util-jvm-module-bug1006311-2012-09-20T19-15-44.132Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2012-07-24 20:29:24 +0000
3+++ CMakeLists.txt 2012-08-07 23:13:20 +0000
4@@ -24,6 +24,11 @@
5 MESSAGE(STATUS "")
6 MESSAGE(STATUS "--- Module: util-jvm ---")
7
8+ FIND_PACKAGE (Zorba REQUIRED HINTS "${ZORBA_BUILD_DIR}")
9+ INCLUDE ("${Zorba_USE_FILE}")
10+
11+ SET_CMAKE_MODULE_PATH()
12+
13 MESSAGE (STATUS "Looking for JNI")
14 ZORBA_FIND_JNI()
15
16@@ -32,11 +37,6 @@
17
18 IF (JNI_FOUND)
19 SET (UTIL_JVM_VERSION 1.0)
20-
21- FIND_PACKAGE (Zorba REQUIRED HINTS "${ZORBA_BUILD_DIR}")
22- INCLUDE ("${Zorba_USE_FILE}")
23-
24- SET_CMAKE_MODULE_PATH()
25
26 # Export this include directory by setting ZORBA_PROJECT_INCLUDE_DIRS
27 SET (ZORBA_PROJECT_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/include")
28
29=== modified file 'cmake_modules/Windows/FindJNI.cmake'
30--- cmake_modules/Windows/FindJNI.cmake 2012-07-02 10:52:42 +0000
31+++ cmake_modules/Windows/FindJNI.cmake 2012-08-07 23:13:20 +0000
32@@ -25,11 +25,11 @@
33 IF (EXISTS "${JAVA_JVM_LIBRARY_PATH}/../jre/bin/client")
34 SET (FOUND_LOCATION "${JAVA_JVM_LIBRARY_PATH}/../jre/bin/client")
35 # find the needed DLL's
36- FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "jvm")
37+ FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "jvm" SKIP_INSTALL)
38 ELSEIF (EXISTS "${JAVA_JVM_LIBRARY_PATH}/../jre/bin/server")
39 SET (FOUND_LOCATION "${JAVA_JVM_LIBRARY_PATH}/../jre/bin/server")
40 # find the needed DLL's
41- FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "jvm")
42+ FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "jvm" SKIP_INSTALL)
43 ELSE (EXISTS "${JAVA_JVM_LIBRARY_PATH}/../jre/bin/client")
44 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.")
45 ENDIF (EXISTS "${JAVA_JVM_LIBRARY_PATH}/../jre/bin/client")

Subscribers

People subscribed via source and target branches

to all changes: