zorba-coders team mailing list archive

[Rodolfo Ochoa <rodolfo.ochoa@xxxxxxxxx>]

Rodolfo Ochoa has proposed merging lp:~zorba-coders/zorba/bug1068323 into lp:zorba.

Requested reviews:
  Juan Zacarias (juan457)
  Chris Hillery (ceejatec)
Related bugs:
  Bug #1068323 in Zorba: "Zorba don't install zorba_api.jar"
  https://bugs.launchpad.net/zorba/+bug/1068323

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug1068323/+merge/130434

Fix for Linux installer
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug1068323/+merge/130434
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'swig/java/CMakeLists.txt'
--- swig/java/CMakeLists.txt	2012-09-19 21:16:15 +0000
+++ swig/java/CMakeLists.txt	2012-10-18 21:37:20 +0000
@@ -75,29 +75,28 @@
     SET (JAVA_SITEARCH_DIR ${CMAKE_INSTALL_PREFIX}/share/java)
   ENDIF (${CMAKE_INSTALL_PREFIX} EQUAL "/usr/local")
 
-  FILE(GLOB JAVA_SWIG_FILES "${CMAKE_CURRENT_BINARY_DIR}/zorba_api.jar")
-  SET(ZORBA_JAVA_JAR "${CMAKE_CURRENT_BINARY_DIR}/zorba_api.jar" PARENT_SCOPE )
+  SET(ZORBA_JAVA_JAR ${CMAKE_CURRENT_BINARY_DIR}/zorba_api.jar PARENT_SCOPE )
 
   IF ( APPLE )
     INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${ZORBA_SWIG_LIB_PREFIX}libzorba_api.jnilib DESTINATION ${JAVA_SITEARCH_DIR})
-		INSTALL(FILES ${JAVA_SWIG_FILES} DESTINATION ${JAVA_SITEARCH_DIR})
+		INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zorba_api.jar DESTINATION ${JAVA_SITEARCH_DIR})
   ELSE ( APPLE )
 		IF(NOT WIN32)
       INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libzorba_api.so DESTINATION ${JAVA_SITEARCH_DIR})
-		  INSTALL(FILES ${JAVA_SWIG_FILES} DESTINATION ${JAVA_SITEARCH_DIR})
+		  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zorba_api.jar DESTINATION ${JAVA_SITEARCH_DIR})
 		ELSE(NOT WIN32)
       IF (MSVC_IDE)
         INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/zorba_api.dll 
         DESTINATION share/java
         COMPONENT "java_swig")
-        INSTALL(FILES ${JAVA_SWIG_FILES} 
+        INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zorba_api.jar 
         DESTINATION share/java
         COMPONENT "java_swig")
       ELSE (MSVC_IDE)
         INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zorba_api.dll 
         DESTINATION share/java
         COMPONENT "java_swig")
-        INSTALL(FILES ${JAVA_SWIG_FILES} 
+        INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zorba_api.jar
         DESTINATION share/java
         COMPONENT "java_swig")
       ENDIF (MSVC_IDE)