The branch, master has been updated
via 5c9e648a9f59f7f478506aa5d33541b81b31cc7f (commit)
from 438d977e409ca5d2c125088138db2f7721b486fa (commit)
- Log -----------------------------------------------------------------
commit 5c9e648a9f59f7f478506aa5d33541b81b31cc7f
Author: Julien Schueller <julien.schueller@xxxxxxxxx>
Date: Mon Jun 3 09:42:49 2013 +0200
Take dist-specifc python path into account.
-----------------------------------------------------------------------
Summary of changes:
python/CMakeLists.txt | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 5a61bc1..bf88e23 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -21,14 +21,19 @@ if ( SWIG_FOUND AND PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND
)
swig_link_libraries ( ftdi1 ${PYTHON_LIBRARIES} )
endif ()
- execute_process ( COMMAND ${PYTHON_EXECUTABLE} -c "import sys; print(
'%d.%d' % ( sys.version_info[0], sys.version_info[1] ) )"
- OUTPUT_VARIABLE PYTHON_VERSION
+ execute_process ( COMMAND ${PYTHON_EXECUTABLE} -c "from distutils import
sysconfig; print( sysconfig.get_python_lib( plat_specific=True,
prefix='${CMAKE_INSTALL_PREFIX}' ) )"
+ OUTPUT_VARIABLE _ABS_PYTHON_MODULE_PATH
OUTPUT_STRIP_TRAILING_WHITESPACE )
-
- set ( SITEPACKAGE lib${LIB_SUFFIX}/python${PYTHON_VERSION}/site-packages )
-
- INSTALL ( FILES ${CMAKE_CURRENT_BINARY_DIR}/_ftdi1.so DESTINATION
${SITEPACKAGE} )
- INSTALL ( FILES ${CMAKE_CURRENT_BINARY_DIR}/ftdi1.py DESTINATION
${SITEPACKAGE} )
+
+ get_filename_component ( _ABS_PYTHON_MODULE_PATH ${_ABS_PYTHON_MODULE_PATH}
ABSOLUTE )
+ file ( RELATIVE_PATH _REL_PYTHON_MODULE_PATH ${CMAKE_INSTALL_PREFIX}
${_ABS_PYTHON_MODULE_PATH} )
+
+ set ( PYTHON_MODULE_PATH
+ ${_REL_PYTHON_MODULE_PATH}
+ )
+
+ INSTALL ( FILES ${CMAKE_CURRENT_BINARY_DIR}/_ftdi1.so DESTINATION
${PYTHON_MODULE_PATH} )
+ INSTALL ( FILES ${CMAKE_CURRENT_BINARY_DIR}/ftdi1.py DESTINATION
${PYTHON_MODULE_PATH} )
if ( DOCUMENTATION AND DOXYGEN_FOUND )
@@ -54,7 +59,7 @@ if ( SWIG_FOUND AND PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND )
endif ()
- set ( LIBFTDI_PYTHON_MODULE_PATH ${CMAKE_INSTALL_PREFIX}/${SITEPACKAGE} )
+ set ( LIBFTDI_PYTHON_MODULE_PATH
${CMAKE_INSTALL_PREFIX}/${PYTHON_MODULE_PATH} )
set ( LIBFTDI_PYTHON_MODULE_PATH ${LIBFTDI_PYTHON_MODULE_PATH} PARENT_SCOPE
) # for ftdiconfig.cmake
message(STATUS "Building python bindings via swig. Will be installed under
${LIBFTDI_PYTHON_MODULE_PATH}")
hooks/post-receive
--
A library to talk to FTDI chips
--
libftdi-git - see http://www.intra2net.com/en/developer/libftdi for details.
To unsubscribe send a mail to libftdi-git+unsubscribe@xxxxxxxxxxxxxxxxxxxxxxx
|
