zorba-coders team mailing list archive

[Cezar Andrei <cezar.andrei@xxxxxxxxx>]

Cezar Andrei has proposed merging lp:~zorba-coders/zorba/mac-install-fix into lp:zorba.

Requested reviews:
  Cezar Andrei (cezar-andrei)
  Paul J. Lucas (paul-lucas)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/mac-install-fix/+merge/193864

Fix install files for java, php, python and ruby libs.
-- 
https://code.launchpad.net/~zorba-coders/zorba/mac-install-fix/+merge/193864
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'swig/java/CMakeLists.txt'
--- swig/java/CMakeLists.txt	2013-09-21 00:39:52 +0000
+++ swig/java/CMakeLists.txt	2013-11-05 00:12:40 +0000
@@ -78,8 +78,8 @@
   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}zorba_api.jnilib DESTINATION ${JAVA_SITEARCH_DIR})
-    INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zorba_api.jar DESTINATION ${JAVA_SITEARCH_DIR})
+    INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${ZORBA_SWIG_LIB_PREFIX}zorba_api_java.jnilib 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_java.so DESTINATION ${JAVA_SITEARCH_DIR})

=== modified file 'swig/php/CMakeLists.txt'
--- swig/php/CMakeLists.txt	2013-09-24 21:47:07 +0000
+++ swig/php/CMakeLists.txt	2013-11-05 00:12:40 +0000
@@ -59,8 +59,12 @@
   #set project folder location for IDEs
   SET_TARGET_PROPERTIES(zorba_api_php PROPERTIES PROJECT_LABEL "PHP" FOLDER "APIs")
 
-  SET_TARGET_PROPERTIES(zorba_api_php PROPERTIES OUTPUT_NAME "zorba_api")
-
+  IF ( APPLE )
+    SET_TARGET_PROPERTIES(zorba_api_php PROPERTIES OUTPUT_NAME "zorba_api_php")
+  ELSE ( APPLE )
+    SET_TARGET_PROPERTIES(zorba_api_php PROPERTIES OUTPUT_NAME "zorba_api")
+  ENDIF ( APPLE )
+  
   IF (NOT WIN32 OR CYGWIN)
     STRING (REPLACE ${CMAKE_INSTALL_PREFIX} "" PHP5_INSTALL_PATH ${PHP5_EXTENSION_DIR})
     SET (PHP5_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}/share/php5")

=== modified file 'swig/python/CMakeLists.txt'
--- swig/python/CMakeLists.txt	2013-09-24 21:47:07 +0000
+++ swig/python/CMakeLists.txt	2013-11-05 00:12:40 +0000
@@ -19,7 +19,12 @@
   INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH})
   SWIG_ADD_MODULE (zorba_api_python python zorba_api.i)
   SWIG_LINK_LIBRARIES (zorba_api_python zorba_simplestore ${PYTHON_LIBRARIES})
-  SET_TARGET_PROPERTIES (_zorba_api_python PROPERTIES OUTPUT_NAME "_zorba_api")
+
+  IF ( APPLE )
+    SET_TARGET_PROPERTIES (_zorba_api_python PROPERTIES OUTPUT_NAME "_zorba_api_python")
+  ELSE ( APPLE)
+    SET_TARGET_PROPERTIES (_zorba_api_python PROPERTIES OUTPUT_NAME "_zorba_api")
+  ENDIF (APPLE )
   
   IF (MSVC_IDE)
     SET_PROPERTY( TARGET _zorba_api_python PROPERTY PROJECT_LABEL "Python")

=== modified file 'swig/ruby/CMakeLists.txt'
--- swig/ruby/CMakeLists.txt	2013-09-25 19:35:12 +0000
+++ swig/ruby/CMakeLists.txt	2013-11-05 00:12:40 +0000
@@ -37,7 +37,7 @@
       SET_TARGET_PROPERTIES(zorba_api PROPERTIES
         INSTALL_RPATH "${CMAKE_INSTALL_RPATH}:${_rpath}"
         BUILD_WITH_INSTALL_RPATH ON
-        OUTPUT_NAME "zorba_api")
+        OUTPUT_NAME "zorba_api_ruby")
     ELSE (APPLE)
       SET_TARGET_PROPERTIES(zorba_api PROPERTIES
         INSTALL_RPATH "${CMAKE_INSTALL_RPATH}:${_rpath}"