Author: rhs
Date: Wed Oct 24 14:57:48 2012
New Revision: 1401718
URL: http://svn.apache.org/viewvc?rev=1401718&view=rev
Log:
fixed detection of LIB_SUFFIX; fixed php configure to not break if PHPRC is set
Modified:
qpid/proton/trunk/proton-c/CMakeLists.txt
qpid/proton/trunk/proton-c/bindings/php/CMakeLists.txt
Modified: qpid/proton/trunk/proton-c/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/CMakeLists.txt?rev=1401718&r1=1401717&r2=1401718&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/CMakeLists.txt (original)
+++ qpid/proton/trunk/proton-c/CMakeLists.txt Wed Oct 24 14:57:48 2012
@@ -17,7 +17,7 @@ set (PN_VERSION "${PN_VERSION_MAJOR}.${P
if (NOT DEFINED LIB_SUFFIX)
get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
- if (${LIB64} STREQUAL "TRUE")
+ if (${LIB64} STREQUAL "TRUE" AND ${CMAKE_SIZEOF_VOID_P} STREQUAL "8")
set(LIB_SUFFIX 64)
else()
set(LIB_SUFFIX "")
Modified: qpid/proton/trunk/proton-c/bindings/php/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/bindings/php/CMakeLists.txt?rev=1401718&r1=1401717&r2=1401718&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/bindings/php/CMakeLists.txt (original)
+++ qpid/proton/trunk/proton-c/bindings/php/CMakeLists.txt Wed Oct 24 14:57:48
2012
@@ -49,7 +49,7 @@ execute_process(COMMAND ${PHP_CONFIG_EXE
string(REPLACE "${PHP_PFX}/" "" PHP_REL_EXT_DIR ${PHP_EXT_DIR})
set(GET_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/get_include_dir.php)
-execute_process(COMMAND ${PHP_EXE} ${GET_INCLUDE_DIR} ${PHP_PFX}
+execute_process(COMMAND ${PHP_EXE} -n ${GET_INCLUDE_DIR} ${PHP_PFX}
OUTPUT_VARIABLE PHP_INCLUDE_DIR
OUTPUT_STRIP_TRAILING_WHITESPACE)
string(REPLACE "${PHP_PFX}/" "" PHP_REL_INCLUDE_DIR ${PHP_INCLUDE_DIR})
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
