Juan Zacarias has proposed merging
lp:~zorba-coders/zorba/language-bindings-install-fix into
lp:~zorba-coders/zorba/zorba-2.9.
Commit message:
Fix for php api Install.
Requested reviews:
Juan Zacarias (juan457)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/language-bindings-install-fix/+merge/165932
Fix for php api Install.
--
https://code.launchpad.net/~zorba-coders/zorba/language-bindings-install-fix/+merge/165932
Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/zorba-2.9.
=== modified file 'cmake_modules/ZorbaModule.cmake'
--- cmake_modules/ZorbaModule.cmake 2013-03-28 01:00:17 +0000
+++ cmake_modules/ZorbaModule.cmake 2013-05-27 19:56:34 +0000
@@ -519,7 +519,7 @@
# Copy jar to jars/ directory and add relative path to classpath file
GET_FILENAME_COMPONENT (_output_filename "${_jar_file}" NAME)
ADD_COPY_RULE ("LIB" "${_jar_file}" "jars/${_output_filename}" ""
- "${JAR_TARGET}" 1 "${JAR_TEST_ONLY}")
+ "${JAR_TARGET}" 1 "${JAR_TEST_ONLY}")
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 19:56:34 +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
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
