Repository: qpid-proton Updated Branches: refs/heads/master b984d5ac0 -> 9c165c7d2
Revert "PROTON-1472: install to standard python site-packages under PREFIX" This reverts commit b984d5ac0a9d319cc27010ba89e5a583d287626e. Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/9c165c7d Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/9c165c7d Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/9c165c7d Branch: refs/heads/master Commit: 9c165c7d2d74dc06a840ef01c8a0e6c0496b6bc1 Parents: b984d5a Author: Andrew Stitcher <[email protected]> Authored: Wed May 3 16:32:15 2017 -0400 Committer: Andrew Stitcher <[email protected]> Committed: Wed May 3 16:32:15 2017 -0400 ---------------------------------------------------------------------- proton-c/bindings/python/CMakeLists.txt | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/9c165c7d/proton-c/bindings/python/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/proton-c/bindings/python/CMakeLists.txt b/proton-c/bindings/python/CMakeLists.txt index f4d72ed..f8c9241 100644 --- a/proton-c/bindings/python/CMakeLists.txt +++ b/proton-c/bindings/python/CMakeLists.txt @@ -49,26 +49,18 @@ set_target_properties(${SWIG_MODULE_cproton_REAL_NAME} find_package(PythonInterp REQUIRED) if (CHECK_SYSINSTALL_PYTHON) - # Install to python_lib in prefix of PYTHON_EXECUTABLE (NOT the CMAKE_INSTALL PREFIX) execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(True))" OUTPUT_VARIABLE PYTHON_SITEARCH_PACKAGES_DEFAULT OUTPUT_STRIP_TRAILING_WHITESPACE) else () - # Install to python_lib location under CMAKE_INSTALL_PREFIX - execute_process(COMMAND - ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(prefix='${CMAKE_INSTALL_PREFIX}'))" - OUTPUT_VARIABLE PYTHON_SITEARCH_PACKAGES_DEFAULT - OUTPUT_STRIP_TRAILING_WHITESPACE) + set (PYTHON_SITEARCH_PACKAGES_DEFAULT ${BINDINGS_DIR}/python) endif () if (NOT PYTHON_SITEARCH_PACKAGES) set (PYTHON_SITEARCH_PACKAGES ${PYTHON_SITEARCH_PACKAGES_DEFAULT}) endif() -# Symlink old non-standard install location to the actual install location -install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${PYTHON_SITEARCH_PACKAGES} ${CMAKE_INSTALL_PREFIX}/${BINDINGS_DIR}/python)") - set (pysrc-generated cproton.py) set (pysrc proton/__init__.py --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
