diff options
| author | nicolas.dufresne <nicolas.dufresne@c587cffe-e639-0410-9787-d7902ae8ed56> | 2010-09-01 15:59:25 +0000 |
|---|---|---|
| committer | nicolas.dufresne <nicolas.dufresne@c587cffe-e639-0410-9787-d7902ae8ed56> | 2010-09-01 15:59:25 +0000 |
| commit | 4bb1bace9462fa7ff94bdd1afef98db6521ba365 (patch) | |
| tree | 8627692d3f2cbb6ab094fda120470b5f22f3e7aa | |
| parent | bd72ba77c6f8d6f5f0bafa26773a2dfef5046dc4 (diff) | |
| download | libproxy-4bb1bace9462fa7ff94bdd1afef98db6521ba365.tar.gz | |
Try install python bindings in libdir
This patch let libproxy install the python bindings in the libdir
path is proper site-packages directory exist. Also moved python
bindings in it's own directory
git-svn-id: http://libproxy.googlecode.com/svn/trunk@745 c587cffe-e639-0410-9787-d7902ae8ed56
| -rw-r--r-- | bindings/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | bindings/python/CMakeLists.txt | 34 | ||||
| -rw-r--r-- | bindings/python/libproxy.py (renamed from bindings/libproxy.py) | 0 |
3 files changed, 35 insertions, 13 deletions
diff --git a/bindings/CMakeLists.txt b/bindings/CMakeLists.txt index b4bdae4..28bad03 100644 --- a/bindings/CMakeLists.txt +++ b/bindings/CMakeLists.txt @@ -1,18 +1,6 @@ option(WITH_PYTHON "Enables Python bindings" ON) if (WITH_PYTHON) - find_package(PythonInterp) - - if(PYTHONINTERP_FOUND) - 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) - endif() - set(PYTHON_SITEPKG_DIR "${PYTHON_SITEPKG_DIR}" CACHE PATH "Python site-package directory.") - install(FILES libproxy.py DESTINATION ${PYTHON_SITEPKG_DIR}) - endif() + add_subdirectory(python) endif() option(WITH_DOTNET "Enables C# bindings" OFF) diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt new file mode 100644 index 0000000..03da2bf --- /dev/null +++ b/bindings/python/CMakeLists.txt @@ -0,0 +1,34 @@ +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) + + message("-- Found python version ${PYTHON_VERSION}") + + if (IS_ABSOLUTE "${LIB_INSTALL_DIR}") + set(libdir "${LIB_INSTALL_DIR}") + else() + set(libdir "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}") + endif() + + if (IS_DIRECTORY "${libdir}/python${PYTHON_VERSION}/site-packages") + set(PYTHON_SITEPKG_DIR "${libdir}/python${PYTHON_VERSION}/site-packages") + 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) + endif() + + message("-- Using PYTHON_SITEPKG_DIR=${PYTHON_SITEPKG_DIR}") + set(PYTHON_SITEPKG_DIR "${PYTHON_SITEPKG_DIR}" CACHE PATH "Python site-package directory.") + + install(FILES libproxy.py DESTINATION ${PYTHON_SITEPKG_DIR}) +endif() diff --git a/bindings/libproxy.py b/bindings/python/libproxy.py index 563c2de..563c2de 100644 --- a/bindings/libproxy.py +++ b/bindings/python/libproxy.py |