qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject qpid-proton git commit: Fix for cmake install (thanks Andrew!)
Date Tue, 02 Dec 2014 10:03:15 GMT
Repository: qpid-proton
Updated Branches:
  refs/heads/examples afc52a00f -> 1c4d9ed89


Fix for cmake install (thanks Andrew!)


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/1c4d9ed8
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/1c4d9ed8
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/1c4d9ed8

Branch: refs/heads/examples
Commit: 1c4d9ed89cc11f142ba08fb439476b052a5df6d2
Parents: afc52a0
Author: Gordon Sim <gsim@redhat.com>
Authored: Tue Dec 2 10:03:54 2014 +0000
Committer: Gordon Sim <gsim@redhat.com>
Committed: Tue Dec 2 10:03:54 2014 +0000

----------------------------------------------------------------------
 proton-c/bindings/python/CMakeLists.txt | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1c4d9ed8/proton-c/bindings/python/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/proton-c/bindings/python/CMakeLists.txt b/proton-c/bindings/python/CMakeLists.txt
index a369661..ee660b6 100644
--- a/proton-c/bindings/python/CMakeLists.txt
+++ b/proton-c/bindings/python/CMakeLists.txt
@@ -60,7 +60,7 @@ set (pysrc
     proton/utils.py
     )
 
-macro (py_compile artifacts 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})")
@@ -72,13 +72,8 @@ macro (py_compile artifacts directory files)
   endforeach (src_file)
 endmacro(py_compile)
 
-py_compile(CPROTON_ARTIFACTS ${CMAKE_CURRENT_BINARY_DIR} ${pysrc-generated})
-#FIXME: can't get following to work; only appends artefacts for first in list
-#py_compile(PROTON_ARTIFACTS ${CMAKE_CURRENT_SOURCE_DIR} ${pysrc})
-py_compile(PROTON_ARTIFACTS ${CMAKE_CURRENT_SOURCE_DIR} proton/__init__.py)
-py_compile(PROTON_ARTIFACTS ${CMAKE_CURRENT_SOURCE_DIR} proton/handlers.py)
-py_compile(PROTON_ARTIFACTS ${CMAKE_CURRENT_SOURCE_DIR} proton/reactors.py)
-py_compile(PROTON_ARTIFACTS ${CMAKE_CURRENT_SOURCE_DIR} proton/utils.py)
+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)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message