You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2013/04/02 16:59:49 UTC
svn commit: r1463582 - in /qpid/branches/0.22/qpid/cpp/bindings:
qmf/python/CMakeLists.txt qmf2/python/CMakeLists.txt
Author: aconway
Date: Tue Apr 2 14:59:49 2013
New Revision: 1463582
URL: http://svn.apache.org/r1463582
Log:
NO-JIRA: cmake: Fix use of file(copy) command, which is not available in cmake 2.6
Use configure_file(COPYONLY) instead.
Modified:
qpid/branches/0.22/qpid/cpp/bindings/qmf/python/CMakeLists.txt
qpid/branches/0.22/qpid/cpp/bindings/qmf2/python/CMakeLists.txt
Modified: qpid/branches/0.22/qpid/cpp/bindings/qmf/python/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/cpp/bindings/qmf/python/CMakeLists.txt?rev=1463582&r1=1463581&r2=1463582&view=diff
==============================================================================
--- qpid/branches/0.22/qpid/cpp/bindings/qmf/python/CMakeLists.txt (original)
+++ qpid/branches/0.22/qpid/cpp/bindings/qmf/python/CMakeLists.txt Tue Apr 2 14:59:49 2013
@@ -33,9 +33,8 @@ set_source_files_properties(${swig_gener
##------------------------------------
# Copy py source to binary dir so pyc/pyo will be generated in binary dir.
-file(COPY
- "${CMAKE_CURRENT_SOURCE_DIR}/qmf.py"
- DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
+# NOTE: not using the file(COPY) command as it is not available in cmake 2.6
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/qmf.py" "${CMAKE_CURRENT_BINARY_DIR}" COPYONLY)
# Python compile the modules
install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m py_compile qmfengine.py
Modified: qpid/branches/0.22/qpid/cpp/bindings/qmf2/python/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/cpp/bindings/qmf2/python/CMakeLists.txt?rev=1463582&r1=1463581&r2=1463582&view=diff
==============================================================================
--- qpid/branches/0.22/qpid/cpp/bindings/qmf2/python/CMakeLists.txt (original)
+++ qpid/branches/0.22/qpid/cpp/bindings/qmf2/python/CMakeLists.txt Tue Apr 2 14:59:49 2013
@@ -29,8 +29,8 @@ swig_link_libraries(cqmf2_python qmf2 ${
set_source_files_properties(${swig_generated_file_fullname} PROPERTIES COMPILE_FLAGS "-fno-strict-aliasing -I${PYTHON_INCLUDE_PATH} -I${qpid-cpp_SOURCE_DIR}/include")
# Move source into binary dir so compiled .pyc,pyo files will be in binary dir.
-file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmf2.py"
- DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
+# NOTE: not using the file(COPY) command as it is not available in cmake 2.6
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/qmf2.py" "${CMAKE_CURRENT_BINARY_DIR}" COPYONLY)
# Python compile the modules
install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m py_compile cqmf2.py
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org