Author: aconway
Date: Tue Apr 2 14:56:29 2013
New Revision: 1463578
URL: http://svn.apache.org/r1463578
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/trunk/qpid/cpp/bindings/qmf/python/CMakeLists.txt
qpid/trunk/qpid/cpp/bindings/qmf2/python/CMakeLists.txt
Modified: qpid/trunk/qpid/cpp/bindings/qmf/python/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qmf/python/CMakeLists.txt?rev=1463578&r1=1463577&r2=1463578&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qmf/python/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/bindings/qmf/python/CMakeLists.txt Tue Apr 2 14:56:29
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/trunk/qpid/cpp/bindings/qmf2/python/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qmf2/python/CMakeLists.txt?rev=1463578&r1=1463577&r2=1463578&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qmf2/python/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/bindings/qmf2/python/CMakeLists.txt Tue Apr 2 14:56:29
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: [email protected]
For additional commands, e-mail: [email protected]
