diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2012-10-22 20:15:42 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2012-10-22 20:15:42 +0000 |
| commit | 6a5be87f4bb5aae83ecfa0e8b6ad9280b5c008b2 (patch) | |
| tree | 7b3dfb739c2c361ea35cd6ca15bfa02e7950b032 /cpp | |
| parent | b385c0538cd3340cac4284ea6ffa129a73f51f5d (diff) | |
| download | qpid-python-6a5be87f4bb5aae83ecfa0e8b6ad9280b5c008b2.tar.gz | |
QPID-3633: Make cmake the primary build tool for the cpp tree
- Avoid using cmake file() command as it is not present in earlier
versions of cmake
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1401063 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/bindings/qmf/python/CMakeLists.txt | 23 | ||||
| -rw-r--r-- | cpp/bindings/qmf2/python/CMakeLists.txt | 25 |
2 files changed, 19 insertions, 29 deletions
diff --git a/cpp/bindings/qmf/python/CMakeLists.txt b/cpp/bindings/qmf/python/CMakeLists.txt index 50e36f36dd..adeb1db78a 100644 --- a/cpp/bindings/qmf/python/CMakeLists.txt +++ b/cpp/bindings/qmf/python/CMakeLists.txt @@ -31,22 +31,8 @@ set_source_files_properties(${swig_generated_file_fullname} PROPERTIES COMPILE_F ##------------------------------------ ## Install the complete Python binding ##------------------------------------ -execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()" OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE) -install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m py_compile qmfengine.py - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})") -install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -O -m py_compile qmfengine.py - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})") -file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/qmf.py DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) -install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m py_compile qmf.py - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})") -install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -O -m py_compile qmf.py - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})") install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qmfengine.py - ${CMAKE_CURRENT_BINARY_DIR}/qmfengine.pyc - ${CMAKE_CURRENT_BINARY_DIR}/qmfengine.pyo ${CMAKE_CURRENT_SOURCE_DIR}/qmf.py - ${CMAKE_CURRENT_BINARY_DIR}/qmf.pyc - ${CMAKE_CURRENT_BINARY_DIR}/qmf.pyo DESTINATION ${PYTHON_SITEARCH_PACKAGES} COMPONENT ${QPID_COMPONENT_CLIENT} ) @@ -55,4 +41,13 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/_qmfengine_python.so DESTINATION ${PYTHON_SITEARCH_PACKAGES} COMPONENT ${QPID_COMPONENT_CLIENT} ) +# Python compile the installed modules +install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m py_compile qmfengine.py + WORKING_DIRECTORY ${PYTHON_SITEARCH_PACKAGES})") +install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -O -m py_compile qmfengine.py + WORKING_DIRECTORY ${PYTHON_SITEARCH_PACKAGES})") +install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m py_compile qmf.py + WORKING_DIRECTORY ${PYTHON_SITEARCH_PACKAGES})") +install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -O -m py_compile qmf.py + WORKING_DIRECTORY ${PYTHON_SITEARCH_PACKAGES})") diff --git a/cpp/bindings/qmf2/python/CMakeLists.txt b/cpp/bindings/qmf2/python/CMakeLists.txt index c245824b64..2a823ff1ee 100644 --- a/cpp/bindings/qmf2/python/CMakeLists.txt +++ b/cpp/bindings/qmf2/python/CMakeLists.txt @@ -31,22 +31,8 @@ set_source_files_properties(${swig_generated_file_fullname} PROPERTIES COMPILE_F ##------------------------------------ ## Install the complete Python binding ##------------------------------------ -execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()" OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE) -install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m py_compile cqmf2.py - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})") -install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -O -m py_compile cqmf2.py - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})") -file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/qmf2.py DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) -install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m py_compile qmf2.py - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})") -install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -O -m py_compile qmf2.py - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})") install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cqmf2.py - ${CMAKE_CURRENT_BINARY_DIR}/cqmf2.pyc - ${CMAKE_CURRENT_BINARY_DIR}/cqmf2.pyo - ${CMAKE_CURRENT_BINARY_DIR}/qmf2.py - ${CMAKE_CURRENT_BINARY_DIR}/qmf2.pyc - ${CMAKE_CURRENT_BINARY_DIR}/qmf2.pyo + ${CMAKE_CURRENT_SOURCE_DIR}/qmf2.py DESTINATION ${PYTHON_SITEARCH_PACKAGES} COMPONENT ${QPID_COMPONENT_CLIENT} ) @@ -55,4 +41,13 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/_cqmf2_python.so DESTINATION ${PYTHON_SITEARCH_PACKAGES} COMPONENT ${QPID_COMPONENT_CLIENT} ) +# Python compile the installed modules +install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m py_compile cqmf2.py + WORKING_DIRECTORY ${PYTHON_SITEARCH_PACKAGES})") +install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -O -m py_compile cqmf2.py + WORKING_DIRECTORY ${PYTHON_SITEARCH_PACKAGES})") +install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m py_compile qmf2.py + WORKING_DIRECTORY ${PYTHON_SITEARCH_PACKAGES})") +install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -O -m py_compile qmf2.py + WORKING_DIRECTORY ${PYTHON_SITEARCH_PACKAGES})") |