NO-JIRA: Make bindings install on windows

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1603302 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 14 insertions, 37 deletions

diff --git a/qpid/cpp/bindings/qmf2/python/CMakeLists.txt b/qpid/cpp/bindings/qmf2/python/CMakeLists.txt
index 941ebdb397..3acd5830fd 100644
--- a/qpid/cpp/bindings/qmf2/python/CMakeLists.txt
+++ b/qpid/cpp/bindings/qmf2/python/CMakeLists.txt
@@ -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}
         )
diff --git a/qpid/cpp/bindings/qmf2/ruby/CMakeLists.txt b/qpid/cpp/bindings/qmf2/ruby/CMakeLists.txt
index 13e478e2dc..74fe777805 100644
--- a/qpid/cpp/bindings/qmf2/ruby/CMakeLists.txt
+++ b/qpid/cpp/bindings/qmf2/ruby/CMakeLists.txt
@@ -42,17 +42,9 @@ swig_link_libraries(cqmf2_ruby qmf2 qpidmessaging qpidtypes ${RUBY_LIBRARY})
 ##----------------------------------
 ## 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}
+)
 
diff --git a/qpid/cpp/bindings/qpid/perl/CMakeLists.txt b/qpid/cpp/bindings/qpid/perl/CMakeLists.txt
index 49073105c8..3c859d689f 100644
--- a/qpid/cpp/bindings/qpid/perl/CMakeLists.txt
+++ b/qpid/cpp/bindings/qpid/perl/CMakeLists.txt
@@ -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
diff --git a/qpid/cpp/bindings/qpid/python/CMakeLists.txt b/qpid/cpp/bindings/qpid/python/CMakeLists.txt
index 6bc07fc589..ac1998b18f 100644
--- a/qpid/cpp/bindings/qpid/python/CMakeLists.txt
+++ b/qpid/cpp/bindings/qpid/python/CMakeLists.txt
@@ -53,7 +53,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qpid_messaging.py
         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}
         )
diff --git a/qpid/cpp/bindings/qpid/ruby/CMakeLists.txt b/qpid/cpp/bindings/qpid/ruby/CMakeLists.txt
index 6ffabddcbb..c31b4d4cde 100644
--- a/qpid/cpp/bindings/qpid/ruby/CMakeLists.txt
+++ b/qpid/cpp/bindings/qpid/ruby/CMakeLists.txt
@@ -53,19 +53,11 @@ set_source_files_properties(${swig_generated_file_fullname} PROPERTIES COMPILE_F
 ##----------------------------------
 ## 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}