diff options
| author | Alan Conway <aconway@apache.org> | 2013-04-02 14:59:49 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2013-04-02 14:59:49 +0000 |
| commit | fcc76c5fc2cc457fbdd4cea336131d504e0029ba (patch) | |
| tree | 4db72ae7382570b5acbe1b330b050b1b010ff9a1 | |
| parent | 50efc868da3d715a966972113b16e99f217bfea3 (diff) | |
| download | qpid-python-fcc76c5fc2cc457fbdd4cea336131d504e0029ba.tar.gz | |
NO-JIRA: cmake: Fix use of file(copy) command, which is not available in cmake 2.6
Use configure_file(COPYONLY) instead.
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1463582 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/cpp/bindings/qmf/python/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | qpid/cpp/bindings/qmf2/python/CMakeLists.txt | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/qpid/cpp/bindings/qmf/python/CMakeLists.txt b/qpid/cpp/bindings/qmf/python/CMakeLists.txt index b6583b97c1..14ba888c78 100644 --- a/qpid/cpp/bindings/qmf/python/CMakeLists.txt +++ b/qpid/cpp/bindings/qmf/python/CMakeLists.txt @@ -33,9 +33,8 @@ set_source_files_properties(${swig_generated_file_fullname} PROPERTIES COMPILE_F ##------------------------------------ # 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 diff --git a/qpid/cpp/bindings/qmf2/python/CMakeLists.txt b/qpid/cpp/bindings/qmf2/python/CMakeLists.txt index 57d9ab0fcb..851a33f4e4 100644 --- a/qpid/cpp/bindings/qmf2/python/CMakeLists.txt +++ b/qpid/cpp/bindings/qmf2/python/CMakeLists.txt @@ -29,8 +29,8 @@ swig_link_libraries(cqmf2_python 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") # 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 |