diff options
| author | nicolas.dufresne <nicolas.dufresne@c587cffe-e639-0410-9787-d7902ae8ed56> | 2010-09-01 16:40:18 +0000 |
|---|---|---|
| committer | nicolas.dufresne <nicolas.dufresne@c587cffe-e639-0410-9787-d7902ae8ed56> | 2010-09-01 16:40:18 +0000 |
| commit | db843468c10078561cb436350da6359698bcadf9 (patch) | |
| tree | f9ae0af14512e2308a7ae0bc4d1924cfc6b20927 | |
| parent | 4bb1bace9462fa7ff94bdd1afef98db6521ba365 (diff) | |
| download | libproxy-db843468c10078561cb436350da6359698bcadf9.tar.gz | |
Fixed overrided of python site-packages path
Last patch broke -DPYTHON_SITEPKG_DIR, this will
make it work again.
git-svn-id: http://libproxy.googlecode.com/svn/trunk@746 c587cffe-e639-0410-9787-d7902ae8ed56
| -rw-r--r-- | bindings/python/CMakeLists.txt | 45 |
1 files changed, 23 insertions, 22 deletions
diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt index 03da2bf..8ff4c6c 100644 --- a/bindings/python/CMakeLists.txt +++ b/bindings/python/CMakeLists.txt @@ -1,34 +1,35 @@ find_package(PythonInterp) if(PYTHONINTERP_FOUND) - execute_process(COMMAND - ${PYTHON_EXECUTABLE} - -c "import sys; print sys.version[0:3]" - OUTPUT_VARIABLE PYTHON_VERSION - OUTPUT_STRIP_TRAILING_WHITESPACE) + set(PYTHON_SITEPKG_DIR "${PYTHON_SITEPKG_DIR}" CACHE PATH "Python site-package directory.") - message("-- Found python version ${PYTHON_VERSION}") + if(NOT PYTHON_SITEPKG_DIR) + execute_process(COMMAND + ${PYTHON_EXECUTABLE} + -c "import sys; print sys.version[0:3]" + OUTPUT_VARIABLE PYTHON_VERSION + OUTPUT_STRIP_TRAILING_WHITESPACE) - if (IS_ABSOLUTE "${LIB_INSTALL_DIR}") - set(libdir "${LIB_INSTALL_DIR}") - else() - set(libdir "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}") - endif() + message(STATUS "Found python version ${PYTHON_VERSION}") - if (IS_DIRECTORY "${libdir}/python${PYTHON_VERSION}/site-packages") - set(PYTHON_SITEPKG_DIR "${libdir}/python${PYTHON_VERSION}/site-packages") - endif() + if (IS_ABSOLUTE "${LIB_INSTALL_DIR}") + set(libdir "${LIB_INSTALL_DIR}") + else() + set(libdir "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}") + endif() - if(NOT PYTHON_SITEPKG_DIR) - execute_process(COMMAND - ${PYTHON_EXECUTABLE} - -c "import distutils.sysconfig ; print distutils.sysconfig.get_python_lib(plat_specific=0)" - OUTPUT_VARIABLE PYTHON_SITEPKG_DIR - OUTPUT_STRIP_TRAILING_WHITESPACE) + if (IS_DIRECTORY "${libdir}/python${PYTHON_VERSION}/site-packages") + set(PYTHON_SITEPKG_DIR "${libdir}/python${PYTHON_VERSION}/site-packages") + else() + execute_process(COMMAND + ${PYTHON_EXECUTABLE} + -c "import distutils.sysconfig ; print distutils.sysconfig.get_python_lib(plat_specific=0)" + OUTPUT_VARIABLE PYTHON_SITEPKG_DIR + OUTPUT_STRIP_TRAILING_WHITESPACE) + endif() endif() - message("-- Using PYTHON_SITEPKG_DIR=${PYTHON_SITEPKG_DIR}") - set(PYTHON_SITEPKG_DIR "${PYTHON_SITEPKG_DIR}" CACHE PATH "Python site-package directory.") + message(STATUS "Using PYTHON_SITEPKG_DIR=${PYTHON_SITEPKG_DIR}") install(FILES libproxy.py DESTINATION ${PYTHON_SITEPKG_DIR}) endif() |