From bb00a3ef75faca80d6180bf693c11d4e4743b2d1 Mon Sep 17 00:00:00 2001 From: alexhudson Date: Wed, 7 Jul 2010 08:47:42 +0000 Subject: [PATCH] Split python install location into interpreted and binary locations. --- cmake/Requirements.cmake | 8 ++++++++ src/libs/python/libbongo/CMakeLists.txt | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/cmake/Requirements.cmake b/cmake/Requirements.cmake index d7649be..7be3fa2 100644 --- a/cmake/Requirements.cmake +++ b/cmake/Requirements.cmake @@ -110,14 +110,22 @@ execute_process(COMMAND python -c "from distutils.sysconfig import get_python_li ) string(STRIP "${PYTHON_SITEPACKAGES_PATH_RAW}" PYTHON_SITEPACKAGES_PATH_RAW) +execute_process(COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" + RESULT_VARIABLE PYTHON_SITELIB_FOUND + OUTPUT_VARIABLE PYTHON_SITELIB_PATH_RAW +) +string(STRIP "${PYTHON_SITELIB_PATH_RAW}" PYTHON_SITELIB_PATH_RAW) + string(LENGTH "${CMAKE_INSTALL_PREFIX}" CMAKE_INSTALL_PREFIX_LEN) string(SUBSTRING "${PYTHON_SITEPACKAGES_PATH_RAW}" 0 ${CMAKE_INSTALL_PREFIX_LEN} PYTHON_SITEPACKAGES_PATH_RAW_PREFIX) if (PYTHON_SITEPACKAGES_FOUND EQUAL 0) if (PYTHON_SITEPACKAGES_PATH_RAW_PREFIX STREQUAL CMAKE_INSTALL_PREFIX) set(PYTHON_SITEPACKAGES_PATH "${PYTHON_SITEPACKAGES_PATH_RAW}") + set(PYTHON_SITELIB_PATH "${PYTHON_SITELIB_PATH_RAW}") else () set(PYTHON_SITEPACKAGES_PATH "${CMAKE_INSTALL_PREFIX}/${PYTHON_SITEPACKAGES_PATH_RAW}") + set(PYTHON_SITELIB_PATH "${CMAKE_INSTALL_PREFIX}/${PYTHON_SITELIB_PATH_RAW}") endif () else (PYTHON_SITEPACKAGES_FOUND EQUAL 0) message(FATAL_ERROR "Couldn't determine where to install Python modules") diff --git a/src/libs/python/libbongo/CMakeLists.txt b/src/libs/python/libbongo/CMakeLists.txt index 05bb829..cb78dc9 100644 --- a/src/libs/python/libbongo/CMakeLists.txt +++ b/src/libs/python/libbongo/CMakeLists.txt @@ -39,5 +39,5 @@ target_link_libraries(bootstrap ${PYTHON_LIBRARIES} ) -install(TARGETS libs bootstrap DESTINATION ${PYTHON_SITEPACKAGES_PATH}/libbongo/) -install(FILES __init__.py DESTINATION ${PYTHON_SITEPACKAGES_PATH}/libbongo/) +install(TARGETS libs bootstrap DESTINATION ${PYTHON_SITELIB_PATH}/libbongo/) +install(FILES __init__.py DESTINATION ${PYTHON_SITELIB_PATH}/libbongo/)