zorba-coders team mailing list archive

[Juan Zacarias <juan457@xxxxxxxxx>]

Juan Zacarias has proposed merging lp:~zorba-coders/zorba/language-bindings-install-fix into lp:zorba.

Commit message:
php swig was creating the zorba_api.so with a wrong name.

Requested reviews:
  Juan Zacarias (juan457)

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

php swig was creating the zorba_api.so with a wrong name.
-- 
https://code.launchpad.net/~zorba-coders/zorba/language-bindings-install-fix/+merge/165917
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'cmake_modules/ZorbaModule.cmake'
--- cmake_modules/ZorbaModule.cmake	2013-05-21 23:46:23 +0000
+++ cmake_modules/ZorbaModule.cmake	2013-05-27 17:08:27 +0000
@@ -522,8 +522,10 @@
 	GET_FILENAME_COMPONENT (_jar_file "${_jar_file}" REALPATH)
       ENDIF (IS_SYMLINK "${_jar_file}")
       GET_FILENAME_COMPONENT (_output_filename "${_jar_file}" NAME)
-      ADD_COPY_RULE ("LIB" "${_jar_file}" "jars/${_output_filename}" "" 
-	"${JAR_TARGET}" 1 "${JAR_TEST_ONLY}")
+      IF (WIN32)
+        ADD_COPY_RULE ("LIB" "${_jar_file}" "jars/${_output_filename}" "" 
+	  "${JAR_TARGET}" 1 "${JAR_TEST_ONLY}")
+      ENDIF (WIN32)
       FILE (APPEND "${_CP_FILE}" "${_output_filename}\n")
     ENDIF (JAR_EXTERNAL AND NOT ZORBA_PACKAGE_EXTERNAL_JARS)
 

=== modified file 'swig/php/CMakeLists.txt'
--- swig/php/CMakeLists.txt	2013-04-17 18:27:03 +0000
+++ swig/php/CMakeLists.txt	2013-05-27 17:08:27 +0000
@@ -59,7 +59,7 @@
   # The following fix was added because of the changes in CMake 2.8, which have the
   # result of naming the java binding library "liblibzorba_api.so" instead of "libzorba_api.so"
   IF (LINUX OR CYGWIN OR APPLE)
-    SET_TARGET_PROPERTIES (${SWIG_MODULE_zorba_api_REAL_NAME} PROPERTIES PREFIX "")
+    SET_TARGET_PROPERTIES (zorba_api_php PROPERTIES PREFIX "")
   ENDIF (LINUX OR CYGWIN OR APPLE)
   
   #set project folder location for IDEs