Author: astitcher
Date: Tue Jun 17 22:44:15 2014
New Revision: 1603302
URL: http://svn.apache.org/r1603302
Log:
NO-JIRA: Make bindings install on windows
Modified:
qpid/trunk/qpid/cpp/bindings/qmf2/python/CMakeLists.txt
qpid/trunk/qpid/cpp/bindings/qmf2/ruby/CMakeLists.txt
qpid/trunk/qpid/cpp/bindings/qpid/perl/CMakeLists.txt
qpid/trunk/qpid/cpp/bindings/qpid/python/CMakeLists.txt
qpid/trunk/qpid/cpp/bindings/qpid/ruby/CMakeLists.txt
Modified: qpid/trunk/qpid/cpp/bindings/qmf2/python/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qmf2/python/CMakeLists.txt?rev=1603302&r1=1603301&r2=1603302&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qmf2/python/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/bindings/qmf2/python/CMakeLists.txt Tue Jun 17 22:44:15
2014
@@ -67,7 +67,7 @@ install(FILES
COMPONENT ${QPID_COMPONENT_CLIENT}
)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/_cqmf2.so
+install(TARGETS ${SWIG_MODULE_cqmf2_REAL_NAME}
DESTINATION ${PYTHON_SITEARCH_PACKAGES}
COMPONENT ${QPID_COMPONENT_CLIENT}
)
Modified: qpid/trunk/qpid/cpp/bindings/qmf2/ruby/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qmf2/ruby/CMakeLists.txt?rev=1603302&r1=1603301&r2=1603302&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qmf2/ruby/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/bindings/qmf2/ruby/CMakeLists.txt Tue Jun 17 22:44:15
2014
@@ -42,17 +42,9 @@ swig_link_libraries(cqmf2_ruby qmf2 qpid
##----------------------------------
## Install the complete Ruby binding
##----------------------------------
-if ((${CMAKE_MAJOR_VERSION} EQUAL 2) AND (${CMAKE_MINOR_VERSION} LESS 8))
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cqmf2_ruby.so
- RENAME cqmf2.so
- DESTINATION ${RUBY_PFX_ARCH_DIR}
- COMPONENT ${QPID_COMPONENT_CLIENT}
- )
-else()
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libcqmf2_ruby.so
- RENAME cqmf2.so
- DESTINATION ${RUBY_PFX_ARCH_DIR}
- COMPONENT ${QPID_COMPONENT_CLIENT}
- )
-endif ((${CMAKE_MAJOR_VERSION} EQUAL 2) AND (${CMAKE_MINOR_VERSION} LESS 8))
+install(TARGETS ${SWIG_MODULE_cqmf2_ruby_REAL_NAME}
+ RENAME cqmf2.so
+ DESTINATION ${RUBY_PFX_ARCH_DIR}
+ COMPONENT ${QPID_COMPONENT_CLIENT}
+)
Modified: qpid/trunk/qpid/cpp/bindings/qpid/perl/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/perl/CMakeLists.txt?rev=1603302&r1=1603301&r2=1603302&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/perl/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/perl/CMakeLists.txt Tue Jun 17 22:44:15
2014
@@ -41,18 +41,11 @@ include_directories(${PERL_INCLUDE_PATH}
##----------------------------------
## install the Perl library separate, since we need to rename the film if
# it's coming from a version of Cmake < 2.8
-if ((${CMAKE_MAJOR_VERSION} EQUAL 2) AND (${CMAKE_MINOR_VERSION} LESS 8))
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cqpid_perl.so
- DESTINATION ${PERL_PFX_ARCHLIB}
- COMPONENT ${QPID_COMPONENT_CLIENT}
- )
-else()
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libcqpid_perl.so
+install(TARGETS ${SWIG_MODULE_cqpid_perl_REAL_NAME}
RENAME cqpid_perl.so
DESTINATION ${PERL_PFX_ARCHLIB}
COMPONENT ${QPID_COMPONENT_CLIENT}
- )
-endif ((${CMAKE_MAJOR_VERSION} EQUAL 2) AND (${CMAKE_MINOR_VERSION} LESS 8))
+)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cqpid_perl.pm
${CMAKE_CURRENT_SOURCE_DIR}/LICENSE
Modified: qpid/trunk/qpid/cpp/bindings/qpid/python/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/python/CMakeLists.txt?rev=1603302&r1=1603301&r2=1603302&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/python/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/python/CMakeLists.txt Tue Jun 17 22:44:15
2014
@@ -53,7 +53,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR
DESTINATION ${PYTHON_SITEARCH_PACKAGES}
COMPONENT ${QPID_COMPONENT_CLIENT}
)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/_qpid_messaging.so
+install(TARGETS ${SWIG_MODULE_qpid_messaging_REAL_NAME}
DESTINATION ${PYTHON_SITEARCH_PACKAGES}
COMPONENT ${QPID_COMPONENT_CLIENT}
)
Modified: qpid/trunk/qpid/cpp/bindings/qpid/ruby/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/ruby/CMakeLists.txt?rev=1603302&r1=1603301&r2=1603302&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/ruby/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/ruby/CMakeLists.txt Tue Jun 17 22:44:15
2014
@@ -53,19 +53,11 @@ set_source_files_properties(${swig_gener
##----------------------------------
## Install the complete Ruby binding
##----------------------------------
-if ((${CMAKE_MAJOR_VERSION} EQUAL 2) AND (${CMAKE_MINOR_VERSION} LESS 8))
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cqpid_ruby.so
- RENAME cqpid.so
- DESTINATION ${RUBY_PFX_ARCH_DIR}
- COMPONENT ${QPID_COMPONENT_CLIENT}
- )
-else()
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libcqpid_ruby.so
- RENAME cqpid.so
- DESTINATION ${RUBY_PFX_ARCH_DIR}
- COMPONENT ${QPID_COMPONENT_CLIENT}
- )
-endif ((${CMAKE_MAJOR_VERSION} EQUAL 2) AND (${CMAKE_MINOR_VERSION} LESS 8))
+install(TARGETS ${SWIG_MODULE_cqpid_ruby_REAL_NAME}
+ RENAME cqpid.so
+ DESTINATION ${RUBY_PFX_ARCH_DIR}
+ COMPONENT ${QPID_COMPONENT_CLIENT}
+)
add_custom_command(OUTPUT ${GEM_BINDINGS_SOURCE_FILE}
COMMAND cp ${swig_generated_file_fullname}
${GEM_BINDINGS_SOURCE_FILE}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
