diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2011-11-03 14:32:01 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2011-11-03 14:32:01 +0000 |
| commit | d057421fbd5695e6ed133c1d271025dc57ab43f5 (patch) | |
| tree | c8d30f06a378c648ee99d193cdfc05e1e3c69434 /cpp/bindings/qpid/python | |
| parent | 596792273ee7d5a694000c291c2d605f976860dd (diff) | |
| download | qpid-python-d057421fbd5695e6ed133c1d271025dc57ab43f5.tar.gz | |
QPID-3464: Build Improvements (CMake) [from Jan-Marek Glogowski]
- Improved CMake build significantly bringing it closer in parity to
autotools build
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1197146 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/bindings/qpid/python')
| -rw-r--r-- | cpp/bindings/qpid/python/CMakeLists.txt | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/cpp/bindings/qpid/python/CMakeLists.txt b/cpp/bindings/qpid/python/CMakeLists.txt index 5e4649cd7c..9cb40162a5 100644 --- a/cpp/bindings/qpid/python/CMakeLists.txt +++ b/cpp/bindings/qpid/python/CMakeLists.txt @@ -23,8 +23,8 @@ set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/python.i PROPERTIES CPLUSPLUS ON) set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/python.i PROPERTIES SWIG_FLAGS "-I${qpid-cpp_SOURCE_DIR}/include") -swig_add_module(cqpid python ${CMAKE_CURRENT_SOURCE_DIR}/python.i) -swig_link_libraries(cqpid qpidmessaging qpidtypes qmf2 ${PYTHON_LIBRARIES}) +swig_add_module(cqpid_python python ${CMAKE_CURRENT_SOURCE_DIR}/python.i) +swig_link_libraries(cqpid_python qpidmessaging qpidtypes qmf2 ${PYTHON_LIBRARIES}) set_source_files_properties(${swig_generated_file_fullname} PROPERTIES COMPILE_FLAGS "-fno-strict-aliasing -I${PYTHON_INCLUDE_PATH} -I${qpid-cpp_SOURCE_DIR}/include") @@ -39,7 +39,12 @@ install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -O -m py_compile cqpi install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cqpid.py ${CMAKE_CURRENT_BINARY_DIR}/cqpid.pyc ${CMAKE_CURRENT_BINARY_DIR}/cqpid.pyo - ${CMAKE_CURRENT_BINARY_DIR}/_cqpid.so DESTINATION ${PYTHON_SITE_PACKAGES} COMPONENT ${QPID_COMPONENT_CLIENT} ) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/_cqpid_python.so + RENAME _cqpid.so + DESTINATION ${PYTHON_SITE_PACKAGES} + COMPONENT ${QPID_COMPONENT_CLIENT} + ) + |