You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gs...@apache.org on 2014/11/26 21:06:20 UTC
[33/35] qpid-proton git commit: fix installation of new package
fix installation of new package
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/805cd17e
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/805cd17e
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/805cd17e
Branch: refs/heads/examples
Commit: 805cd17e360fd77eab29d60955a2193c7e7f0635
Parents: d02fdad
Author: Gordon Sim <gs...@redhat.com>
Authored: Wed Nov 26 17:15:38 2014 +0000
Committer: Gordon Sim <gs...@redhat.com>
Committed: Wed Nov 26 17:15:38 2014 +0000
----------------------------------------------------------------------
proton-c/bindings/python/CMakeLists.txt | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/805cd17e/proton-c/bindings/python/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/proton-c/bindings/python/CMakeLists.txt b/proton-c/bindings/python/CMakeLists.txt
index 6be421e..eb53174 100644
--- a/proton-c/bindings/python/CMakeLists.txt
+++ b/proton-c/bindings/python/CMakeLists.txt
@@ -55,20 +55,20 @@ endif()
set (pysrc-generated cproton.py)
set (pysrc proton/__init__.py)
-macro (py_compile directory files)
+macro (py_compile directory files artifacts)
foreach (src_file ${files})
install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m py_compile ${src_file}
WORKING_DIRECTORY ${directory})")
install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -O -m py_compile ${src_file}
WORKING_DIRECTORY ${directory})")
- list(APPEND PYTHON_ARTIFACTS ${directory}/${src_file}
+ list(APPEND ${artifacts} ${directory}/${src_file}
${directory}/${src_file}c
${directory}/${src_file}o)
endforeach (src_file)
endmacro(py_compile)
-py_compile(${CMAKE_CURRENT_BINARY_DIR} ${pysrc-generated})
-py_compile(${CMAKE_CURRENT_SOURCE_DIR} ${pysrc})
+py_compile(${CMAKE_CURRENT_BINARY_DIR} ${pysrc-generated} CPROTON_ARTIFACTS)
+py_compile(${CMAKE_CURRENT_SOURCE_DIR} ${pysrc} PROTON_ARTIFACTS)
find_program(EPYDOC_EXE epydoc)
mark_as_advanced (EPYDOC_EXE)
@@ -84,9 +84,12 @@ if (EPYDOC_EXE)
${OPTIONAL_ARG})
endif (EPYDOC_EXE)
-install(FILES ${PYTHON_ARTIFACTS}
+install(FILES ${CPROTON_ARTIFACTS}
DESTINATION ${PYTHON_SITEARCH_PACKAGES}
COMPONENT Python)
+install(FILES ${PROTON_ARTIFACTS}
+ DESTINATION "${PYTHON_SITEARCH_PACKAGES}/proton/"
+ COMPONENT Python)
install(TARGETS ${SWIG_MODULE_cproton_REAL_NAME}
DESTINATION ${PYTHON_SITEARCH_PACKAGES}
COMPONENT Python)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org