qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From astitc...@apache.org
Subject svn commit: r1405806 - in /qpid/proton/trunk/proton-c: CMakeLists.txt bindings/php/CMakeLists.txt bindings/python/CMakeLists.txt bindings/ruby/CMakeLists.txt
Date Mon, 05 Nov 2012 14:32:31 GMT
Author: astitcher
Date: Mon Nov  5 14:32:30 2012
New Revision: 1405806

URL: http://svn.apache.org/viewvc?rev=1405806&view=rev
Log:
Correctly fix RPATH leaking through "make install" for the bindings builds:
- To give cmake an oportunity to remove the RPATH you need to use the
  regular install (TARGETS ...) command not install (FILES ...)

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

Modified: qpid/proton/trunk/proton-c/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/CMakeLists.txt?rev=1405806&r1=1405805&r2=1405806&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/CMakeLists.txt (original)
+++ qpid/proton/trunk/proton-c/CMakeLists.txt Mon Nov  5 14:32:30 2012
@@ -26,11 +26,6 @@ set (PN_VERSION "${PN_VERSION_MAJOR}.${P
 
 include(soversion.cmake)
 
-# Disable rpath
-if (DEFINED PROTON_DISABLE_RPATH)
-  set (CMAKE_SKIP_RPATH ${PROTON_DISABLE_RPATH})
-endif()
-
 # In rpm builds the build sets some variables:
 #  CMAKE_INSTALL_PREFIX - this is a standard cmake variable
 #  INCLUDE_INSTALL_DIR

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=1405806&r1=1405805&r2=1405806&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/bindings/php/CMakeLists.txt (original)
+++ qpid/proton/trunk/proton-c/bindings/php/CMakeLists.txt Mon Nov  5 14:32:30 2012
@@ -72,7 +72,7 @@ set(PHP_EXT_DIR ${PHP_EXT_DIR_DEFAULT} C
 set(PHP_INI_DIR ${PHP_INI_DIR_DEFAULT} CACHE PATH "Directory scanned for PHP ini files.")
 set(PHP_INCLUDE_DIR ${PHP_INCLUDE_DIR_DEFAULT} CACHE PATH "PHP include directory.")
 
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cproton.so
+install(TARGETS cproton
         DESTINATION ${PHP_EXT_DIR}
         COMPONENT PHP)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cproton.php

Modified: qpid/proton/trunk/proton-c/bindings/python/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/bindings/python/CMakeLists.txt?rev=1405806&r1=1405805&r2=1405806&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/bindings/python/CMakeLists.txt (original)
+++ qpid/proton/trunk/proton-c/bindings/python/CMakeLists.txt Mon Nov  5 14:32:30 2012
@@ -18,8 +18,8 @@
 #
 set(CMAKE_SWIG_FLAGS "-threads")
 
-swig_add_module(cproton python python.i)
 include_directories (${PYTHON_INCLUDE_PATH})
+swig_add_module(cproton python python.i)
 swig_link_libraries(cproton ${BINDING_DEPS} ${PYTHON_LIBRARIES})
 
 find_package(PythonInterp REQUIRED)
@@ -58,7 +58,6 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR
               ${CMAKE_CURRENT_SOURCE_DIR}/proton.pyo
         DESTINATION ${PYTHON_SITEARCH_PACKAGES}
         COMPONENT Python)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/_cproton.so
-        RENAME _cproton.so
+install(TARGETS _cproton
         DESTINATION ${PYTHON_SITEARCH_PACKAGES}
         COMPONENT Python)

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=1405806&r1=1405805&r2=1405806&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/bindings/ruby/CMakeLists.txt (original)
+++ qpid/proton/trunk/proton-c/bindings/ruby/CMakeLists.txt Mon Nov  5 14:32:30 2012
@@ -20,10 +20,7 @@
 include_directories (${RUBY_INCLUDE_PATH})
 swig_add_module(cproton-ruby ruby ruby.i)
 swig_link_libraries(cproton-ruby ${BINDING_DEPS} ${RUBY_LIBRARY})
-set_target_properties(cproton-ruby PROPERTIES PREFIX "")
-add_custom_command(TARGET cproton-ruby
-                   POST_BUILD
-                   COMMAND cmake -E rename cproton-ruby.so cproton.so)
+set_target_properties(cproton-ruby PROPERTIES PREFIX "" OUTPUT_NAME "cproton")
 
 execute_process(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG['prefix']"
                 OUTPUT_VARIABLE RUBY_PREFIX
@@ -31,7 +28,6 @@ execute_process(COMMAND ${RUBY_EXECUTABL
 
 string(REPLACE "${RUBY_PREFIX}/" "" RUBY_PFX_ARCH_DIR ${RUBY_ARCH_DIR})
 
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cproton.so
-        RENAME cproton.so
+install(TARGETS cproton-ruby
         DESTINATION ${RUBY_PFX_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