libftdi-git Archives

Subject: A library to talk to FTDI chips branch, master, updated. v1.0-22-gd0c1196

From: libftdi-git@xxxxxxxxxxxxxxxxxxxxxxx
To: libftdi-git@xxxxxxxxxxxxxxxxxxxxxxx
Date: Mon, 8 Jul 2013 09:21:18 +0200 (CEST)
The branch, master has been updated
       via  d0c1196190ba2adce20129ae263ceedc029603d6 (commit)
       via  97046aa688d3e56de6fcac99651cf2e82ca04ce1 (commit)
      from  5c9e648a9f59f7f478506aa5d33541b81b31cc7f (commit)


- Log -----------------------------------------------------------------
commit d0c1196190ba2adce20129ae263ceedc029603d6
Author: Thomas Jarosch <thomas.jarosch@xxxxxxxxxxxxx>
Date:   Mon Jul 8 09:21:15 2013 +0200

    Whitespace cleanup

commit 97046aa688d3e56de6fcac99651cf2e82ca04ce1
Author: Michel Zou <xantares09@xxxxxxxxxxx>
Date:   Mon Jul 8 09:20:31 2013 +0200

    swig wrapper: Remove dynamic python module soname

-----------------------------------------------------------------------

Summary of changes:
 python/CMakeLists.txt |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index bf88e23..9341054 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -1,4 +1,5 @@
 option ( PYTHON_BINDINGS "Build python bindings via swig" ON )
+option ( LINK_PYTHON_LIBRARY "Link against python libraries" ON )
 
 if ( PYTHON_BINDINGS )
   find_package ( SWIG )
@@ -15,23 +16,23 @@ if ( SWIG_FOUND AND PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND 
)
   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" ) )
+  if ( LINK_PYTHON_LIBRARY )
     swig_link_libraries ( ftdi1 ${PYTHON_LIBRARIES} )
   endif ()
 
+  set_target_properties ( ${SWIG_MODULE_ftdi1_REAL_NAME} PROPERTIES NO_SONAME 
ON )
+
   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 )
-                      
+
   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} )                   
-                        
+  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} )
 
@@ -58,7 +59,7 @@ if ( SWIG_FOUND AND PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND )
       add_dependencies( ${SWIG_MODULE_ftdi1_REAL_NAME} doc_i )
 
   endif ()
-  
+
   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   

Current Thread
  • A library to talk to FTDI chips branch, master, updated. v1.0-22-gd0c1196, libftdi-git <=