Hello, I am maintain libftdi library at ALT Linux distribution and want to share some building patches.
I have three fixes today and share this fixes at my git repository (branch patched): http://git.altlinux.org/people/sin/packages/libftdi.git Fixes browse here: http://git.altlinux.org/people/sin/packages/libftdi.git?p=libftdi.git;a=shortlog;h=refs/heads/patched First patch fixed libftdi.hpp with include of system ftdi.h, because ftdi needs to be found not in current directory, but in system: diff --git a/ftdipp/ftdi.hpp b/ftdipp/ftdi.hpp index 9c345c3..cdcfa7b 100644 (file) --- a/ftdipp/ftdi.hpp +++ b/ftdipp/ftdi.hpp @@ -32,7 +32,7 @@ on this file might be covered by the GNU General Public License. #include <list> #include <string> #include <boost/shared_ptr.hpp> -#include "ftdi.h" +#include <ftdi.h> namespace Ftdi { Second patch fixed cmake build with not remove doc directory for build in source, because in source directory consists projects files: diff --git a/CMakeLists.txt b/CMakeLists.txt index 8197615..090165d 100644 (file) --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -114,8 +114,8 @@ if(DOCUMENTATION AND DOXYGEN_FOUND) # Create doc directory add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/doc - COMMAND rm -rf ${CMAKE_BINARY_DIR}/doc - COMMAND mkdir ${CMAKE_BINARY_DIR}/doc + COMMAND rm -rf ${CMAKE_BINARY_DIR}/doc/{html,man} + COMMAND mkdir -p ${CMAKE_BINARY_DIR}/doc DEPENDS ftdi ftdipp ) Third patch fixed cmake build of python binding link with libftdi, due python module _ftdi.so not links with ../src/libftdi.so.0.18.0: diff --git a/bindings/CMakeLists.txt b/bindings/CMakeLists.txt index 48f535c..573e51b 100644 (file) --- a/bindings/CMakeLists.txt +++ b/bindings/CMakeLists.txt @@ -9,7 +9,7 @@ if(PYTHON_BINDINGS AND SWIG_FOUND AND PYTHONLIBS_FOUND) INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH}) SWIG_ADD_MODULE(ftdi python ftdi.i) - SWIG_LINK_LIBRARIES(ftdi ${PYTHON_LIBRARIES}) + SWIG_LINK_LIBRARIES(ftdi ${PYTHON_LIBRARIES} ftdi) GET_FILENAME_COMPONENT(PYTHON_LIB_INSTALL ${PYTHON_LIBRARY} PATH) GET_FILENAME_COMPONENT(SITEPACKAGE ${PYTHON_LIB_INSTALL}/../site-packages ABSOLUTE) I would be glad to know, that this changes will be usefull and be applied. -- Sin (Sinelnikov Evgeny) Etersoft -- libftdi - see http://www.intra2net.com/en/developer/libftdi for details. To unsubscribe send a mail to libftdi+unsubscr...@developer.intra2net.com
