The branch, master has been updated
via e15345abbb5bfc4492a93551bc030e530f43f179 (commit)
via 74049fe086881da494885357a48a20b9f75423d3 (commit)
via e4e406b4f3a435b2768a2f46450c874a0a4e0712 (commit)
from b920e19c65af9ca38dbe7112ebd882b88bf61309 (commit)
- Log -----------------------------------------------------------------
commit e15345abbb5bfc4492a93551bc030e530f43f179
Author: Michel Zou <xantares09@xxxxxxxxxxx>
Date: Thu Jan 31 21:23:43 2013 +0100
Added version attribute.
commit 74049fe086881da494885357a48a20b9f75423d3
Author: Michel Zou <xantares09@xxxxxxxxxxx>
Date: Wed Jan 30 21:57:28 2013 +0100
Allow to override LIB_SUFFIX
commit e4e406b4f3a435b2768a2f46450c874a0a4e0712
Author: Michel Zou <xantares09@xxxxxxxxxxx>
Date: Wed Jan 30 15:01:47 2013 +0100
Fixed deprecated cmake python variable.
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 10 ++--
bindings/CMakeLists.txt | 123 +++++++++++++++++++++++------------------------
bindings/ftdi1.i | 5 ++
3 files changed, 72 insertions(+), 66 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0bad0d7..3616c66 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,10 +46,12 @@ set(CPACK_COMPONENT_SHAREDLIBS_GROUP "Development")
set(CPACK_COMPONENT_STATICLIBS_GROUP "Development")
set(CPACK_COMPONENT_HEADERS_GROUP "Development")
-# automatically set lib suffix
-if ( UNIX AND NOT APPLE AND NOT CMAKE_CROSSCOMPILING AND NOT EXISTS
"/etc/debian_version" )
- if ( CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT LIB_SUFFIX )
- set ( LIB_SUFFIX 64 )
+# guess LIB_SUFFIX, don't take debian multiarch into account
+if ( NOT DEFINED LIB_SUFFIX )
+ if ( CMAKE_SYSTEM_NAME MATCHES "Linux" AND NOT CMAKE_CROSSCOMPILING AND NOT
EXISTS "/etc/debian_version" )
+ if ( "${CMAKE_SIZEOF_VOID_P}" EQUAL "8" )
+ set ( LIB_SUFFIX 64 )
+ endif ()
endif ()
endif ()
diff --git a/bindings/CMakeLists.txt b/bindings/CMakeLists.txt
index f6dcd30..0c335c8 100644
--- a/bindings/CMakeLists.txt
+++ b/bindings/CMakeLists.txt
@@ -1,63 +1,62 @@
-
-find_package ( SWIG )
-include(UseSWIG)
-find_package ( PythonLibs )
-find_package ( PythonInterp )
-
-option(PYTHON_BINDINGS "Build python bindings via swig" ON)
-
-if(PYTHON_BINDINGS AND SWIG_FOUND AND PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND)
- INCLUDE_DIRECTORIES(BEFORE ${CMAKE_SOURCE_DIR}/src)
- INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH})
- LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../src)
-
- swig_add_module ( ftdi1 python ftdi1.i )
- swig_link_libraries ( ftdi1 ftdi1 )
-
- # do not link python modules on debian
- #
http://www.debian.org/doc/packaging-manuals/python-policy/ch-module_packages.html
- if ( NOT UNIX OR ( UNIX AND NOT EXISTS "/etc/debian_version" ) )
- 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
- 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})
-
- if(DOCUMENTATION AND DOXYGEN_FOUND)
-
- set(CMAKE_SWIG_FLAGS -DDOXYGEN=${DOXYGEN_FOUND})
-
- # Run doxygen to only generate the xml
- add_custom_command ( OUTPUT ${CMAKE_BINARY_DIR}/doc/xml/ftdi_8c.xml
- COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/doc
- COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_BINARY_DIR}/Doxyfile.xml
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
- DEPENDS ${c_headers};${c_sources};${cpp_sources};${cpp_headers}
- )
-
- # generate .i from doxygen .xml
- add_custom_command ( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/ftdi1_doc.i
- COMMAND ${PYTHON_EXECUTABLE}
${CMAKE_CURRENT_SOURCE_DIR}/doxy2swig.py -n
- ${CMAKE_BINARY_DIR}/doc/xml/ftdi_8c.xml
- ${CMAKE_CURRENT_BINARY_DIR}/ftdi1_doc.i
- DEPENDS ${CMAKE_BINARY_DIR}/doc/xml/ftdi_8c.xml
- )
- add_custom_target ( doc_i DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/ftdi1_doc.i )
- add_dependencies( ${SWIG_MODULE_ftdi1_REAL_NAME} doc_i )
-
- endif(DOCUMENTATION AND DOXYGEN_FOUND)
-
-
-
-
- set ( LIBFTDI_PYTHON_MODULE_PATH ${CMAKE_INSTALL_PREFIX}/${SITEPACKAGE}
PARENT_SCOPE )
+option ( PYTHON_BINDINGS "Build python bindings via swig" ON )
+
+if ( PYTHON_BINDINGS )
+ find_package ( SWIG )
+ find_package ( PythonLibs )
+ find_package ( PythonInterp )
+endif ()
+
+if ( SWIG_FOUND AND PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND )
+ include ( UseSWIG )
+ include_directories ( BEFORE ${CMAKE_SOURCE_DIR}/src )
+ include_directories ( ${PYTHON_INCLUDE_DIRS} )
+ link_directories ( ${CMAKE_CURRENT_BINARY_DIR}/../src )
+
+ swig_add_module ( ftdi1 python ftdi1.i )
+ swig_link_libraries ( ftdi1 ftdi1 )
+
+ # do not link python modules on debian
+ #
http://www.debian.org/doc/packaging-manuals/python-policy/ch-module_packages.html
+ if ( NOT UNIX OR ( UNIX AND NOT EXISTS "/etc/debian_version" ) )
+ 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
+ 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} )
+
+ if ( DOCUMENTATION AND DOXYGEN_FOUND )
+
+ set(CMAKE_SWIG_FLAGS -DDOXYGEN=${DOXYGEN_FOUND})
+
+ # Run doxygen to only generate the xml
+ add_custom_command ( OUTPUT ${CMAKE_BINARY_DIR}/doc/xml/ftdi_8c.xml
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/doc
+ COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_BINARY_DIR}/Doxyfile.xml
+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+ DEPENDS ${c_headers};${c_sources};${cpp_sources};${cpp_headers}
+ )
+
+ # generate .i from doxygen .xml
+ add_custom_command ( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/ftdi1_doc.i
+ COMMAND ${PYTHON_EXECUTABLE}
${CMAKE_CURRENT_SOURCE_DIR}/doxy2swig.py -n
+ ${CMAKE_BINARY_DIR}/doc/xml/ftdi_8c.xml
+ ${CMAKE_CURRENT_BINARY_DIR}/ftdi1_doc.i
+ DEPENDS ${CMAKE_BINARY_DIR}/doc/xml/ftdi_8c.xml
+ )
+ add_custom_target ( doc_i DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/ftdi1_doc.i )
+ add_dependencies( ${SWIG_MODULE_ftdi1_REAL_NAME} doc_i )
+
+ endif ()
+
+ set ( LIBFTDI_PYTHON_MODULE_PATH ${CMAKE_INSTALL_PREFIX}/${SITEPACKAGE} )
+ 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}")
-else(PYTHON_BINDINGS AND SWIG_FOUND AND PYTHONLIBS_FOUND AND
PYTHONINTERP_FOUND)
- message(STATUS "Not building python bindings")
-endif(PYTHON_BINDINGS AND SWIG_FOUND AND PYTHONLIBS_FOUND AND
PYTHONINTERP_FOUND)
+else ()
+ message(STATUS "Not building python bindings")
+endif ()
diff --git a/bindings/ftdi1.i b/bindings/ftdi1.i
index 728a91b..ba9aca2 100644
--- a/bindings/ftdi1.i
+++ b/bindings/ftdi1.i
@@ -2,6 +2,7 @@
%module(docstring="Python interface to libftdi1") ftdi1
%feature("autodoc","1");
+
#ifdef DOXYGEN
%include "ftdi1_doc.i"
#endif
@@ -129,3 +130,7 @@ PyObject* convertString( const char *v, Py_ssize_t len )
%{
#include <ftdi_i.h>
%}
+
+%pythoncode %{
+__version__ = get_library_version().version_str
+%}
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
|
