qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject svn commit: r1424567 - in /qpid/proton/trunk/proton-c/bindings: perl/CMakeLists.txt php/CMakeLists.txt ruby/CMakeLists.txt
Date Thu, 20 Dec 2012 16:21:07 GMT
Author: rhs
Date: Thu Dec 20 16:21:07 2012
New Revision: 1424567

URL: http://svn.apache.org/viewvc?rev=1424567&view=rev
Log:
PROTON-188: applied modified patch

Modified:
    qpid/proton/trunk/proton-c/bindings/perl/CMakeLists.txt
    qpid/proton/trunk/proton-c/bindings/php/CMakeLists.txt
    qpid/proton/trunk/proton-c/bindings/ruby/CMakeLists.txt

Modified: qpid/proton/trunk/proton-c/bindings/perl/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/bindings/perl/CMakeLists.txt?rev=1424567&r1=1424566&r2=1424567&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/bindings/perl/CMakeLists.txt (original)
+++ qpid/proton/trunk/proton-c/bindings/perl/CMakeLists.txt Thu Dec 20 16:21:07 2012
@@ -19,13 +19,6 @@
 
 include_directories("${PERL_INCLUDE_PATH}")
 
-# honor the install prefix
-execute_process(COMMAND ${PERL_EXECUTABLE} "-V::prefix:"
-                OUTPUT_VARIABLE QPERL_PREFIX
-                OUTPUT_STRIP_TRAILING_WHITESPACE)
-string(REGEX REPLACE "'(.*)'" "\\1" PERL_PREFIX ${QPERL_PREFIX})
-string(REPLACE ${PERL_PREFIX} ${CMAKE_INSTALL_PREFIX} PERL_PFX_ARCHLIB ${PERL_ARCHLIB})
-
 # Need to pass in the same compiler flags used to build Perl itself
 execute_process(COMMAND perl -MConfig -e "print \$Config{ccflags}"
                 OUTPUT_VARIABLE PERLCFLAGS)
@@ -36,6 +29,6 @@ swig_link_libraries(cproton_perl ${BINDI
 
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libcproton_perl.so
               ${CMAKE_CURRENT_BINARY_DIR}/cproton_perl.pm
-        DESTINATION ${PERL_PFX_ARCHLIB}
+        DESTINATION ${PERL_ARCHLIB}
         COMPONENT Perl)
 

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=1424567&r1=1424566&r2=1424567&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/bindings/php/CMakeLists.txt (original)
+++ qpid/proton/trunk/proton-c/bindings/php/CMakeLists.txt Thu Dec 20 16:21:07 2012
@@ -49,10 +49,6 @@ execute_process(COMMAND ${PHP_CONFIG_EXE
                 OUTPUT_VARIABLE PHP_OPTS
                 OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-# prepend install prefix to the extension directory
-string(REPLACE ${QPHP_PREFIX} ${CMAKE_INSTALL_PREFIX}
-       PHP_PFX_EXT_DIR ${PHP_EXT_DIR_DEFAULT})
-
 set(GET_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/get_include_dir.php)
 execute_process(COMMAND ${PHP_EXE} -n ${GET_INCLUDE_DIR} ${QPHP_PREFIX}
                 OUTPUT_VARIABLE PHP_INCLUDE_DIR_DEFAULT
@@ -62,10 +58,6 @@ if ("${PHP_INCLUDE_DIR_DEFAULT}" STREQUA
   set(PHP_INCLUDE_DIR_DEFAULT "/usr/share/php")
 endif()
 
-# prepend install prefix to the include directory
-string(REPLACE ${QPHP_PREFIX} ${CMAKE_INSTALL_PREFIX}
-       PHP_PFX_INCLUDE_DIR ${PHP_INCLUDE_DIR_DEFAULT})
-
 string(REGEX MATCH "--with-config-file-scan-dir=([^ ]*)" PHP_OPT_MATCH ${PHP_OPTS})
 set (PHP_INI_DIR_DEFAULT ${CMAKE_MATCH_1})
 
@@ -73,15 +65,9 @@ if ("${PHP_INI_DIR_DEFAULT}" STREQUAL ""
   set(PHP_INI_DIR_DEFAULT "/etc/php.d")
 endif()
 
-if (IS_ABSOLUTE "${PHP_INI_DIR_DEFAULT}" AND (NOT (IS_ABSOLUTE ${CMAKE_INSTALL_PREFIX})))
-  string(SUBSTRING ${PHP_INI_DIR_DEFAULT} 1 -1 PHP_INI_DIR_DEFAULT)
-  string(SUBSTRING ${PHP_PFX_EXT_DIR}     1 -1 PHP_PFX_EXT_DIR)
-  string(SUBSTRING ${PHP_PFX_INCLUDE_DIR} 1 -1 PHP_PFX_INCLUDE_DIR)
-endif ()
-
-set(PHP_EXT_DIR ${PHP_PFX_EXT_DIR} CACHE PATH "PHP extensions directory.")
+set(PHP_EXT_DIR ${PHP_EXT_DIR_DEFAULT} CACHE PATH "PHP extensions directory.")
 set(PHP_INI_DIR ${PHP_INI_DIR_DEFAULT} CACHE PATH "Directory scanned for PHP ini files.")
-set(PHP_INCLUDE_DIR ${PHP_PFX_INCLUDE_DIR} CACHE PATH "PHP include directory.")
+set(PHP_INCLUDE_DIR ${PHP_INCLUDE_DIR_DEFAULT} CACHE PATH "PHP include directory.")
 
 install(TARGETS cproton
         DESTINATION ${PHP_EXT_DIR}

Modified: qpid/proton/trunk/proton-c/bindings/ruby/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/bindings/ruby/CMakeLists.txt?rev=1424567&r1=1424566&r2=1424567&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/bindings/ruby/CMakeLists.txt (original)
+++ qpid/proton/trunk/proton-c/bindings/ruby/CMakeLists.txt Thu Dec 20 16:21:07 2012
@@ -26,12 +26,6 @@ set_target_properties(cproton-ruby
     OUTPUT_NAME "cproton"
     LINK_FLAGS "${CATCH_UNDEFINED}" )
 
-execute_process(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG['prefix']"
-                OUTPUT_VARIABLE RUBY_PREFIX
-                OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-string(REPLACE "${RUBY_PREFIX}/" "" RUBY_PFX_ARCH_DIR ${RUBY_ARCH_DIR})
-
 install(TARGETS cproton-ruby
-        DESTINATION ${RUBY_PFX_ARCH_DIR}
+        DESTINATION ${RUBY_ARCH_DIR}
         COMPONENT Ruby)



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message