Merge branch 'renames-for-release'

diff --git a/.gitignore b/.gitignore
index dcf277d..2559aa2 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -38,8 +38,8 @@ examples/simple
 .*.swp
 
 # libftdi specific
-libftdi-config
-libftdi.spec
+libftdi1-config
+libftdi1.spec
 
 # CMake
 CMakeCache.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 07f8bb9..14911ad 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,8 +1,8 @@
 # Project
-project(libftdi)
+project(libftdi1)
 set(MAJOR_VERSION 1)
 set(MINOR_VERSION 0)
-set(PACKAGE libftdi)
+set(PACKAGE libftdi1)
 set(VERSION_STRING ${MAJOR_VERSION}.${MINOR_VERSION})
 set(VERSION ${VERSION_STRING})
 SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}")
@@ -37,7 +37,7 @@ set(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "C++ Headers")
 set(CPACK_COMPONENT_SHAREDLIBS_DESCRIPTION
 "Shared library for general use.")
 set(CPACK_COMPONENT_STATICLIBS_DESCRIPTION
-"Static library, good if you want to embed libftdi in your application.")
+"Static library, good if you want to embed libftdi1 in your application.")
 set(CPACK_COMPONENT_HEADERS_DESCRIPTION
 "C/C++ header files.")
 
@@ -65,7 +65,7 @@ endif(NOT APPLE)
 # Package information
 set(CPACK_PACKAGE_VERSION              ${VERSION_STRING})
 set(CPACK_PACKAGE_CONTACT              "Intra2net AG <libftdi@developer.intra2net.com>")
-set(CPACK_PACKAGE_DESCRIPTION          "libftdi library.")
+set(CPACK_PACKAGE_DESCRIPTION          "libftdi1 library.")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY  ${CPACK_PACKAGE_DESCRIPTION}
                                        )
 # Package settings
@@ -81,9 +81,9 @@ if(${WIN32})
   set(CPACK_CMAKE_GENERATOR              "MinGW Makefiles")
   set(CPACK_PACKAGE_NAME                 "${PROJECT_NAME}")
   set(CPACK_PACKAGE_VENDOR               "")
-  set(CPACK_PACKAGE_INSTALL_DIRECTORY    "libftdi")
+  set(CPACK_PACKAGE_INSTALL_DIRECTORY    "libftdi1")
   set(CPACK_PACKAGE_FILE_NAME            "${PROJECT_NAME}-${VERSION_STRING}-win32")
-  set(CPACK_NSIS_DISPLAY_NAME            "libftdi")
+  set(CPACK_NSIS_DISPLAY_NAME            "libftdi1")
   set(CPACK_NSIS_MODIFY_PATH             "ON")
 endif(${WIN32})
 
@@ -138,7 +138,7 @@ if(DOCUMENTATION AND DOXYGEN_FOUND)
    OUTPUT ${CMAKE_BINARY_DIR}/doc
    COMMAND rm -rf ${CMAKE_BINARY_DIR}/doc/{html,man}
    COMMAND mkdir -p ${CMAKE_BINARY_DIR}/doc
-   DEPENDS ftdi ftdipp
+   DEPENDS ftdi1 ftdipp1
    )
 
    # Run doxygen
@@ -168,14 +168,15 @@ if(${WIN32})
    set(libdir      ${CMAKE_INSTALL_PREFIX}/bin)
 endif(${WIN32})
 
-configure_file(${CMAKE_SOURCE_DIR}/libftdi.pc.in ${CMAKE_BINARY_DIR}/libftdi.pc @ONLY)
-configure_file(${CMAKE_SOURCE_DIR}/libftdipp.pc.in ${CMAKE_BINARY_DIR}/libftdipp.pc @ONLY)
-install(FILES ${CMAKE_BINARY_DIR}/libftdi.pc ${CMAKE_BINARY_DIR}/libftdipp.pc
+configure_file(${CMAKE_SOURCE_DIR}/libftdi1.spec.in ${CMAKE_BINARY_DIR}/libftdi1.spec @ONLY)
+configure_file(${CMAKE_SOURCE_DIR}/libftdi1.pc.in ${CMAKE_BINARY_DIR}/libftdi1.pc @ONLY)
+configure_file(${CMAKE_SOURCE_DIR}/libftdipp1.pc.in ${CMAKE_BINARY_DIR}/libftdipp1.pc @ONLY)
+install(FILES ${CMAKE_BINARY_DIR}/libftdi1.pc ${CMAKE_BINARY_DIR}/libftdipp1.pc
         DESTINATION lib${LIB_SUFFIX}/pkgconfig)
 
 if(${UNIX})
-    configure_file(${CMAKE_SOURCE_DIR}/libftdi-config.in ${CMAKE_BINARY_DIR}/libftdi-config @ONLY)
-    install(PROGRAMS ${CMAKE_BINARY_DIR}/libftdi-config DESTINATION bin)
+    configure_file(${CMAKE_SOURCE_DIR}/libftdi1-config.in ${CMAKE_BINARY_DIR}/libftdi1-config @ONLY)
+    install(PROGRAMS ${CMAKE_BINARY_DIR}/libftdi1-config DESTINATION bin)
 endif(${UNIX})
 
 include(CPack)

diff --git a/LICENSE b/LICENSE
index dd66312..f1831c0 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-The C library "libftdi" is distributed under the
+The C library "libftdi1" is distributed under the
 GNU Library General Public License version 2.
 
 A copy of the GNU Library General Public License (LGPL) is included
@@ -6,7 +6,7 @@ in this distribution, in the file COPYING.LIB.
 
 ----------------------------------------------------------------------
 
-The C++ wrapper "ftdipp" is distributed under the GNU General
+The C++ wrapper "ftdipp1" is distributed under the GNU General
 Public License version 2 (with a special exception described below).
 
 A copy of the GNU General Public License (GPL) is included

diff --git a/TODO b/TODO
index 0b419b5..1363a34 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,11 +1,4 @@
 *** TODO for 1.0 release ***
-Build related:
-- Rename the library and header file,
-  so libftdi 0.x and 1.x can co-exist
-
-API extentions:
-- TO DECIDE: Make ftdi structure opaque?
-
 Misc:
 - Resolve TODO entries in ftdi_eeprom
 - Look into merging ftdi_eeprom and examples/eeprom

diff --git a/bindings/CMakeLists.txt b/bindings/CMakeLists.txt
index b17d8a8..28061a6 100644 (file)
--- a/bindings/CMakeLists.txt
+++ b/bindings/CMakeLists.txt
@@ -10,8 +10,8 @@ if(PYTHON_BINDINGS AND SWIG_FOUND AND PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND)
     INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH})
     LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../src)
 
-    SWIG_ADD_MODULE(ftdi python ftdi.i)
-    SWIG_LINK_LIBRARIES(ftdi ftdi ${PYTHON_LIBRARIES})
+    SWIG_ADD_MODULE(ftdi1 python ftdi1.i)
+    SWIG_LINK_LIBRARIES(ftdi1 ftdi1 ${PYTHON_LIBRARIES})
 
     execute_process ( COMMAND ${PYTHON_EXECUTABLE} -c "import sys; print '%d.%d' % ( sys.version_info[0], sys.version_info[1] )"
                       OUTPUT_VARIABLE PYTHON_VERSION
@@ -19,8 +19,8 @@ if(PYTHON_BINDINGS AND SWIG_FOUND AND PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND)
 
     set ( SITEPACKAGE lib${LIB_SUFFIX}/python${PYTHON_VERSION}/site-packages )
 
-    INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/_ftdi.so DESTINATION ${SITEPACKAGE})
-    INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/ftdi.py DESTINATION ${SITEPACKAGE})
+    INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/_ftdi1.so DESTINATION ${SITEPACKAGE})
+    INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/ftdi1.py DESTINATION ${SITEPACKAGE})
 
     message(STATUS "Building python bindings via swig. Will be installed under ${CMAKE_INSTALL_PREFIX}/${SITEPACKAGE}")
 else(PYTHON_BINDINGS AND SWIG_FOUND AND PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND)

diff --git a/bindings/ftdi.i b/bindings/ftdi1.i
similarity index 96%
rename from bindings/ftdi.i
rename to bindings/ftdi1.i
index 42c2646..f26a334 100644 (file)
--- a/bindings/ftdi.i
+++ b/bindings/ftdi1.i
@@ -1,15 +1,12 @@
-/* File: ftdi.i */
+/* File: ftdi1.i */
 
-%module(docstring="Python interface to libftdi") ftdi
+%module(docstring="Python interface to libftdi1") ftdi1
 
 %include <typemaps.i>
 %include <cstring.i>
 
 %typemap(in) unsigned char* = char*;
 
-%ignore ftdi_write_data_async;
-%ignore ftdi_async_complete;
-
 %immutable ftdi_version_info::version_str;
 %immutable ftdi_version_info::snapshot_str;
 

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 11e5aab..6793d89 100644 (file)
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -21,16 +21,16 @@ if (EXAMPLES)
     add_executable(eeprom eeprom.c)
 
     # Linkage
-    target_link_libraries(simple ftdi)
-    target_link_libraries(bitbang ftdi)
-    target_link_libraries(bitbang2 ftdi)
-    target_link_libraries(bitbang_cbus ftdi)
-    target_link_libraries(bitbang_ft2232 ftdi)
-    target_link_libraries(find_all ftdi)
-    target_link_libraries(serial_test ftdi)
-    target_link_libraries(baud_test ftdi)
-    target_link_libraries(stream_test ftdi)
-    target_link_libraries(eeprom ftdi)
+    target_link_libraries(simple ftdi1)
+    target_link_libraries(bitbang ftdi1)
+    target_link_libraries(bitbang2 ftdi1)
+    target_link_libraries(bitbang_cbus ftdi1)
+    target_link_libraries(bitbang_ft2232 ftdi1)
+    target_link_libraries(find_all ftdi1)
+    target_link_libraries(serial_test ftdi1)
+    target_link_libraries(baud_test ftdi1)
+    target_link_libraries(stream_test ftdi1)
+    target_link_libraries(eeprom ftdi1)
 
     # libftdi++ examples
     if(FTDI_BUILD_CPP)
@@ -43,7 +43,7 @@ if (EXAMPLES)
             add_executable(find_all_pp find_all_pp.cpp)
 
             # Linkage
-            target_link_libraries(find_all_pp ftdipp)
+            target_link_libraries(find_all_pp ftdipp1)
         endif(Boost_FOUND)
     endif(FTDI_BUILD_CPP)
 

diff --git a/examples/python/complete.py b/examples/python/complete.py
index cee917d..f1b737c 100644 (file)
--- a/examples/python/complete.py
+++ b/examples/python/complete.py
@@ -9,7 +9,7 @@ of the swig generated python wrapper
 You need to build and install the wrapper first"""
 
 import os
-import ftdi
+import ftdi1 as ftdi
 import time
 
 # initialize

diff --git a/examples/python/simple.py b/examples/python/simple.py
index ecd5c2f..82ef6bb 100644 (file)
--- a/examples/python/simple.py
+++ b/examples/python/simple.py
@@ -8,7 +8,7 @@ of the swig generated python wrapper
 
 You need to build and install the wrapper first"""
 
-import ftdi
+import ftdi1 as ftdi
 
 def main():
     """Main program"""

diff --git a/ftdi_eeprom/CMakeLists.txt b/ftdi_eeprom/CMakeLists.txt
index 38d7a96..f2552ee 100644 (file)
--- a/ftdi_eeprom/CMakeLists.txt
+++ b/ftdi_eeprom/CMakeLists.txt
@@ -27,7 +27,7 @@ if (FTDI_EEPROM)
         )
 
         add_executable(ftdi_eeprom main.c)
-        target_link_libraries(ftdi_eeprom ftdi)
+        target_link_libraries(ftdi_eeprom ftdi1)
         target_link_libraries(ftdi_eeprom ${Confuse_LIBRARIES})
 
     else(Confuse_FOUND)

diff --git a/ftdipp/CMakeLists.txt b/ftdipp/CMakeLists.txt
index 23000c9..48e5a76 100644 (file)
--- a/ftdipp/CMakeLists.txt
+++ b/ftdipp/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Check
 set(FTDI_BUILD_CPP False PARENT_SCOPE)
 
-option(FTDIPP "Build C++ binding library libftdi++" ON)
+option(FTDIPP "Build C++ binding library libftdi1++" ON)
 
 if (FTDIPP)
 
@@ -19,32 +19,32 @@ if (FTDIPP)
         set(cpp_headers   ftdi.hpp)
 
         set(FTDI_BUILD_CPP True PARENT_SCOPE)
-        message(STATUS "Building libftdi++")
+        message(STATUS "Building libftdi1++")
 
         # Shared library
-        add_library(ftdipp SHARED ${cpp_sources})
+        add_library(ftdipp1 SHARED ${cpp_sources})
 
         math(EXPR VERSION_FIXUP "${MAJOR_VERSION} + 1")    # Compatiblity with previous releases
-        set_target_properties(ftdipp PROPERTIES VERSION ${VERSION_FIXUP}.${MINOR_VERSION}.0 SOVERSION 2)
+        set_target_properties(ftdipp1 PROPERTIES VERSION ${VERSION_FIXUP}.${MINOR_VERSION}.0 SOVERSION 2)
 
         # Static library
-        add_library(ftdipp-static STATIC ${cpp_sources})
-        set_target_properties(ftdipp-static PROPERTIES OUTPUT_NAME "ftdipp")
+        add_library(ftdipp1-static STATIC ${cpp_sources})
+        set_target_properties(ftdipp1-static PROPERTIES OUTPUT_NAME "ftdipp1")
 
         # Prevent clobbering each other during the build
-        set_target_properties(ftdipp PROPERTIES CLEAN_DIRECT_OUTPUT 1)
-        set_target_properties(ftdipp-static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+        set_target_properties(ftdipp1 PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+        set_target_properties(ftdipp1-static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
 
         # Dependencies
-        target_link_libraries(ftdipp ftdi ${LIBUSB_LIBRARIES} ${BOOST_LIBRARIES})
+        target_link_libraries(ftdipp1 ftdi1 ${LIBUSB_LIBRARIES} ${BOOST_LIBRARIES})
 
         # Install
         if(${UNIX})
-            install( TARGETS ftdipp
+            install( TARGETS ftdipp1
                         LIBRARY DESTINATION lib${LIB_SUFFIX}
                         COMPONENT sharedlibs
                         )
-            install( TARGETS ftdipp-static
+            install( TARGETS ftdipp1-static
                         ARCHIVE DESTINATION lib${LIB_SUFFIX}
                         COMPONENT staticlibs
                         )
@@ -55,11 +55,11 @@ if (FTDIPP)
         endif(${UNIX})
 
         if(${WIN32})
-            install( TARGETS ftdipp
+            install( TARGETS ftdipp1
                         DESTINATION bin
                         COMPONENT sharedlibs
                         )
-            install( TARGETS ftdipp-static
+            install( TARGETS ftdipp1-static
                         DESTINATION bin
                         COMPONENT staticlibs
                         )
@@ -70,11 +70,11 @@ if (FTDIPP)
         endif(${WIN32})
 
     else(Boost_FOUND)
-        message(STATUS "Boost not found, won't build libftdi++")
+        message(STATUS "Boost not found, won't build libftdi1++")
     endif(Boost_FOUND)
 
 else(FTDIPP)
 
-    message(STATUS "Not building libftdi++")
+    message(STATUS "Not building libftdi1++")
 
 endif(FTDIPP)

diff --git a/libftdi-config.in b/libftdi1-config.in
similarity index 93%
rename from libftdi-config.in
rename to libftdi1-config.in
index a71de4e..a3e2058 100644 (file)
--- a/libftdi-config.in
+++ b/libftdi1-config.in
@@ -7,7 +7,7 @@ exec_prefix_set=no
 usage()
 {
        cat <<EOF
-Usage: libftdi-config [OPTIONS] [LIBRARIES]
+Usage: libftdi1-config [OPTIONS] [LIBRARIES]
 Options:
        [--prefix[=DIR]]
        [--exec-prefix[=DIR]]
@@ -75,5 +75,5 @@ if test "$echo_cflags" = "yes"; then
        echo $includes
 fi
 if test "$echo_libs" = "yes"; then
-       echo -L@libdir@ -lftdi @LIBS@
+       echo -L@libdir@ -lftdi1 @LIBS@
 fi

diff --git a/libftdi.pc.in b/libftdi1.pc.in
similarity index 84%
rename from libftdi.pc.in
rename to libftdi1.pc.in
index f8aaaeb..300f38c 100644 (file)
--- a/libftdi.pc.in
+++ b/libftdi1.pc.in
@@ -5,9 +5,9 @@ includedir=@includedir@
 libusb_libs=@LIBUSB_1_0_LIBS@
 libusb_cflags=@LIBUSB_1_0_CFLAGS@
 
-Name: libftdi
+Name: libftdi1
 Description: Library to program and control the FTDI USB controller
 Requires: libusb-1.0
 Version: @VERSION@
-Libs: -L${libdir} -lftdi ${libusb_libs}
+Libs: -L${libdir} -lftdi1 ${libusb_libs}
 Cflags: -I${includedir} ${libusb_cflags}

diff --git a/libftdi.spec.in b/libftdi1.spec.in
similarity index 77%
rename from libftdi.spec.in
rename to libftdi1.spec.in
index ec4d063..8c06b09 100644 (file)
--- a/libftdi.spec.in
+++ b/libftdi1.spec.in
@@ -1,5 +1,5 @@
 Summary:   Library to program and control the FTDI USB controller
-Name:      libftdi
+Name:      libftdi1
 Version:   @VERSION@
 Release:   1
 License:   LGPL for libftdi and GPLv2+linking exception for the C++ wrapper
@@ -7,21 +7,21 @@ Group:     System Environment/Libraries
 Vendor:    Intra2net AG
 Source:    http://www.intra2net.com/en/developer/libftdi/download/%{name}-%{version}.tar.gz
 Buildroot: /tmp/%{name}-%{version}-root
-Requires:  libusb
-BuildRequires: libusb, libusb-devel, pkgconfig, doxygen
+Requires:  libusb1
+BuildRequires: libusb1, libusb1-devel, pkgconfig, doxygen
 Prefix:    /usr
 URL:       http://www.intra2net.com/en/developer/libftdi
 
 %package   devel
-Summary:   Header files and static libraries for libftdi
+Summary:   Header files and static libraries for libftdi1
 Group:     Development/Libraries
-Requires:  libftdi = %{version}, libusb-devel
+Requires:  libftdi1 = %{version}, libusb1-devel
 
 %description 
 Library to program and control the FTDI USB controller
 
 %description devel
-Header files and static libraries for libftdi
+Header files and static libraries for libftdi1
 
 %prep
 %setup -q
@@ -55,13 +55,13 @@ rm -fr $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %doc COPYING.LIB COPYING.GPL LICENSE
-%{_libdir}/libftdi*.so*
+%{_libdir}/libftdi1*.so*
 
 %files devel
 %defattr(-,root,root)
 %doc doc/html doc/man
-%{_bindir}/libftdi-config
-%{prefix}/include/*.h
-%{prefix}/include/*.hpp
-%{_libdir}/libftdi*.*a
+%{_bindir}/libftdi1-config
+%{prefix}/include/libftdi1/*.h
+%{prefix}/include/libftdi1/*.hpp
+%{_libdir}/libftdi1*.*a
 %{_libdir}/pkgconfig/*.pc

diff --git a/libftdipp.pc.in b/libftdipp1.pc.in
similarity index 55%
rename from libftdipp.pc.in
rename to libftdipp1.pc.in
index ee81fef..8158f38 100644 (file)
--- a/libftdipp.pc.in
+++ b/libftdipp1.pc.in
@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: libftdipp
-Description: C++ wrapper for libftdi
-Requires: libftdi
+Name: libftdipp1
+Description: C++ wrapper for libftdi1
+Requires: libftdi1
 Version: @VERSION@
-Libs: -L${libdir} -lftdipp
+Libs: -L${libdir} -lftdipp1
 Cflags: -I${includedir}

diff --git a/packages/CMakeLists.txt b/packages/CMakeLists.txt
index 00b2696..4bf58d2 100644 (file)
--- a/packages/CMakeLists.txt
+++ b/packages/CMakeLists.txt
@@ -7,8 +7,8 @@ if("${PACKAGE}" STREQUAL "Debian")
    set(CPACK_PACKAGE_VERSION              ${CPACK_PACKAGE_VERSION}-${REVISION} PARENT_SCOPE)
 
    # Dependencies
-   set(CPACK_DEBIAN_PACKAGE_DEPENDS       "libusb-0.1-4" PARENT_SCOPE)
-   set(DEBIAN_PACKAGE_BUILDS_DEPENDS      "cmake, libusb-dev" PARENT_SCOPE)
+   set(CPACK_DEBIAN_PACKAGE_DEPENDS       "libusb-1.0-0" PARENT_SCOPE)
+   set(DEBIAN_PACKAGE_BUILDS_DEPENDS      "cmake, libusb2-dev" PARENT_SCOPE)
 
    # Bundles
    message("-- Installing udev rules to /etc/udev/rules.d")
@@ -18,4 +18,4 @@ if("${PACKAGE}" STREQUAL "Debian")
 endif("${PACKAGE}" STREQUAL "Debian")
 
 # General RPM rules
-set(CPACK_RPM_PACKAGE_DEPENDS       "libusb" PARENT_SCOPE)
+set(CPACK_RPM_PACKAGE_DEPENDS       "libusb1" PARENT_SCOPE)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7ce9eda..0b8c009 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -21,31 +21,31 @@ configure_file(ftdi_version_i.h.in "${CMAKE_CURRENT_BINARY_DIR}/ftdi_version_i.h
 set(c_sources     ftdi.c ftdi_stream.c)
 set(c_headers     ftdi.h)
 
-add_library(ftdi SHARED ${c_sources})
+add_library(ftdi1 SHARED ${c_sources})
 
 math(EXPR VERSION_FIXUP "${MAJOR_VERSION} + 1")    # Compatiblity with previous releases
-set_target_properties(ftdi PROPERTIES VERSION ${VERSION_FIXUP}.${MINOR_VERSION}.0 SOVERSION 2)
+set_target_properties(ftdi1 PROPERTIES VERSION ${VERSION_FIXUP}.${MINOR_VERSION}.0 SOVERSION 2)
 
 # Static library
-add_library(ftdi-static STATIC ${c_sources})
-set_target_properties(ftdi-static PROPERTIES OUTPUT_NAME "ftdi")
+add_library(ftdi1-static STATIC ${c_sources})
+set_target_properties(ftdi1-static PROPERTIES OUTPUT_NAME "ftdi1")
 
 # Prevent clobbering each other during the build
-set_target_properties(ftdi PROPERTIES CLEAN_DIRECT_OUTPUT 1)
-set_target_properties(ftdi-static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+set_target_properties(ftdi1 PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+set_target_properties(ftdi1-static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
 
 # Dependencies
-target_link_libraries(ftdi ${LIBUSB_LIBRARIES})
+target_link_libraries(ftdi1 ${LIBUSB_LIBRARIES})
 
 # Install
 if(${UNIX})
 
-   install( TARGETS ftdi
+   install( TARGETS ftdi1
             LIBRARY DESTINATION lib${LIB_SUFFIX}
             COMPONENT sharedlibs
             )
 
-   install( TARGETS ftdi-static
+   install( TARGETS ftdi1-static
             ARCHIVE DESTINATION lib${LIB_SUFFIX}
             COMPONENT staticlibs
             )
@@ -59,12 +59,12 @@ endif(${UNIX})
 
 if(${WIN32})
 
-   install( TARGETS ftdi
+   install( TARGETS ftdi1
             DESTINATION bin
             COMPONENT sharedlibs
             )
 
-   install( TARGETS ftdi-static
+   install( TARGETS ftdi1-static
             DESTINATION bin
             COMPONENT staticlibs
             )

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 8737f66..53e3f7b 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -15,13 +15,13 @@ if(Boost_UNIT_TEST_FRAMEWORK_FOUND)
         baudrate.cpp
     )
 
-    add_executable(test_libftdi ${cpp_tests})
-    target_link_libraries(test_libftdi ftdi ${Boost_UNIT_TEST_FRAMEWORK_LIBRARIES})
+    add_executable(test_libftdi1 ${cpp_tests})
+    target_link_libraries(test_libftdi1 ftdi1 ${Boost_UNIT_TEST_FRAMEWORK_LIBRARIES})
 
-    add_test(test_libftdi test_libftdi)
+    add_test(test_libftdi1 test_libftdi1)
 
     # Add custom target so we run easily run "make check"
-    add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} DEPENDS test_libftdi)
+    add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} DEPENDS test_libftdi1)
 
 else(Boost_UNIT_TEST_FRAMEWORK_FOUND)