A library to talk to FTDI chips branch, master, updated. v0.18-17-g7abf523

[libftdi-git@xxxxxxxxxxxxxxxxxxxxxxx]

The branch, master has been updated
       via  7abf523a2ca3912895d087a9b998da6bc7b84339 (commit)
       via  7fae57b875babdfc164f683979537aad1e48298a (commit)
       via  2e889fc39e76700e72abe0c33ad7878715d66cbd (commit)
      from  59d4cb318efe151e8c5c7fe451b84e381799ba17 (commit)


- Log -----------------------------------------------------------------
commit 7abf523a2ca3912895d087a9b998da6bc7b84339
Author: Evgeny Sinelnikov <sin@xxxxxxxxxxx>
Date:   Tue May 11 11:05:02 2010 +0400

    Fix cmake build with not remove doc directory for build in source

commit 7fae57b875babdfc164f683979537aad1e48298a
Author: Evgeny Sinelnikov <sin@xxxxxxxxxxx>
Date:   Mon May 2 16:09:45 2011 +0400

    Fix cmake build of python binding link with libftdi

commit 2e889fc39e76700e72abe0c33ad7878715d66cbd
Author: Evgeny Sinelnikov <sin@xxxxxxxxxxx>
Date:   Sun Jun 28 01:52:02 2009 +0400

    Fix libftdi.hpp with include of system ftdi.h

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

Summary of changes:
 CMakeLists.txt          |    4 ++--
 bindings/CMakeLists.txt |    2 +-
 ftdipp/ftdi.hpp         |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8197615..090165d 100644
--- 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
    )
 
diff --git a/bindings/CMakeLists.txt b/bindings/CMakeLists.txt
index 48f535c..573e51b 100644
--- 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)
diff --git a/ftdipp/ftdi.hpp b/ftdipp/ftdi.hpp
index 9c345c3..cdcfa7b 100644
--- 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
 {


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