Merge lp:~zorba-coders/zorba/bug1068323 into lp:zorba

Proposed by Rodolfo Ochoa
Status: Merged
Approved by: Chris Hillery
Approved revision: 11102
Merged at revision: 11108
Proposed branch: lp:~zorba-coders/zorba/bug1068323
Merge into: lp:zorba
Diff against target: 38 lines (+5/-6)
1 file modified
swig/java/CMakeLists.txt (+5/-6)
To merge this branch: bzr merge lp:~zorba-coders/zorba/bug1068323
Reviewer Review Type Date Requested Status
Chris Hillery Approve
Juan Zacarias Approve
Review via email: mp+130434@code.launchpad.net

Commit message

This is working on linux very well, seems that cmake don't like quoted variables or file variables if they doesn't exist yet.

Description of the change

Fix for Linux installer

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

Validation queue job bug1068323-2012-10-24T08-58-48.013Z 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 'swig/java/CMakeLists.txt'
2--- swig/java/CMakeLists.txt 2012-09-19 21:16:15 +0000
3+++ swig/java/CMakeLists.txt 2012-10-18 21:37:20 +0000
4@@ -75,29 +75,28 @@
5 SET (JAVA_SITEARCH_DIR ${CMAKE_INSTALL_PREFIX}/share/java)
6 ENDIF (${CMAKE_INSTALL_PREFIX} EQUAL "/usr/local")
7
8- FILE(GLOB JAVA_SWIG_FILES "${CMAKE_CURRENT_BINARY_DIR}/zorba_api.jar")
9- SET(ZORBA_JAVA_JAR "${CMAKE_CURRENT_BINARY_DIR}/zorba_api.jar" PARENT_SCOPE )
10+ SET(ZORBA_JAVA_JAR ${CMAKE_CURRENT_BINARY_DIR}/zorba_api.jar PARENT_SCOPE )
11
12 IF ( APPLE )
13 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${ZORBA_SWIG_LIB_PREFIX}libzorba_api.jnilib DESTINATION ${JAVA_SITEARCH_DIR})
14- INSTALL(FILES ${JAVA_SWIG_FILES} DESTINATION ${JAVA_SITEARCH_DIR})
15+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zorba_api.jar DESTINATION ${JAVA_SITEARCH_DIR})
16 ELSE ( APPLE )
17 IF(NOT WIN32)
18 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libzorba_api.so DESTINATION ${JAVA_SITEARCH_DIR})
19- INSTALL(FILES ${JAVA_SWIG_FILES} DESTINATION ${JAVA_SITEARCH_DIR})
20+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zorba_api.jar DESTINATION ${JAVA_SITEARCH_DIR})
21 ELSE(NOT WIN32)
22 IF (MSVC_IDE)
23 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/zorba_api.dll
24 DESTINATION share/java
25 COMPONENT "java_swig")
26- INSTALL(FILES ${JAVA_SWIG_FILES}
27+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zorba_api.jar
28 DESTINATION share/java
29 COMPONENT "java_swig")
30 ELSE (MSVC_IDE)
31 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zorba_api.dll
32 DESTINATION share/java
33 COMPONENT "java_swig")
34- INSTALL(FILES ${JAVA_SWIG_FILES}
35+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zorba_api.jar
36 DESTINATION share/java
37 COMPONENT "java_swig")
38 ENDIF (MSVC_IDE)

Subscribers

People subscribed via source and target branches