You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by mc...@apache.org on 2013/12/04 16:53:14 UTC
svn commit: r1547834 -
/qpid/proton/trunk/proton-c/bindings/python/CMakeLists.txt
Author: mcpierce
Date: Wed Dec 4 15:53:14 2013
New Revision: 1547834
URL: http://svn.apache.org/r1547834
Log:
Revert "PROTON-445: Python install now honors CMAKE_INSTALL_PREFIX"
This reverts commit e9557788a0098de4d6ec3e201fb0f53596e211c7.
Modified:
qpid/proton/trunk/proton-c/bindings/python/CMakeLists.txt
Modified: qpid/proton/trunk/proton-c/bindings/python/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/bindings/python/CMakeLists.txt?rev=1547834&r1=1547833&r2=1547834&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/bindings/python/CMakeLists.txt (original)
+++ qpid/proton/trunk/proton-c/bindings/python/CMakeLists.txt Wed Dec 4 15:53:14 2013
@@ -30,14 +30,12 @@ set_target_properties(_cproton
find_package(PythonInterp REQUIRED)
-if (NOT PYTHON_INSTALL_PREFIX)
- set(PYTHON_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
-endif (NOT PYTHON_INSTALL_PREFIX)
-
-execute_process(COMMAND ${PYTHON_EXECUTABLE}
- -c "from distutils.sysconfig import get_python_lib; print get_python_lib(True, prefix='${PYTHON_INSTALL_PREFIX}')"
- OUTPUT_VARIABLE PYTHON_SITEARCH_PACKAGES
- OUTPUT_STRIP_TRAILING_WHITESPACE)
+if (NOT PYTHON_SITEARCH_PACKAGES)
+ execute_process(COMMAND ${PYTHON_EXECUTABLE}
+ -c "from distutils.sysconfig import get_python_lib; print get_python_lib(True)"
+ OUTPUT_VARIABLE PYTHON_SITEARCH_PACKAGES
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+endif ()
install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m py_compile cproton.py
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org