ftdi_stream: fix timeout setting: tv_usec field of timeval is in microseconds, not ms

[libftdi] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 08e5771..74f80f4 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,11 +1,11 @@
 # Project
 project(libftdi1)
 set(MAJOR_VERSION 1)
-set(MINOR_VERSION 1)
+set(MINOR_VERSION 2)
 set(PACKAGE libftdi1)
 set(VERSION_STRING ${MAJOR_VERSION}.${MINOR_VERSION})
 set(VERSION ${VERSION_STRING})
-set ( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake )
+set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 
 # CMake
 if("${CMAKE_BUILD_TYPE}" STREQUAL "")
@@ -113,6 +113,8 @@ add_custom_target(dist
             | bzip2 > ${CMAKE_BINARY_DIR}/${ARCHIVE_NAME}.tar.bz2
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
 
+# Tests
+option ( BUILD_TESTS "Build unit tests with Boost Unit Test framework" ON )
 
 # Documentation
 option ( DOCUMENTATION "Generate API documentation with Doxygen" ON )
@@ -190,7 +192,7 @@ set ( LIBFTDI_STATIC_LIBRARY ftdi1.a )
 set ( LIBFTDI_STATIC_LIBRARIES ${LIBFTDI_STATIC_LIBRARY} )
 list ( APPEND LIBFTDI_STATIC_LIBRARIES ${LIBUSB_LIBRARIES} )
 if (FTDI_BUILD_CPP)
-  set ( LIBFTDIPP_LIBRARY ftdi1pp )
+  set ( LIBFTDIPP_LIBRARY ftdipp1 )
   set ( LIBFTDIPP_LIBRARIES ${LIBFTDIPP_LIBRARY} )
   list ( APPEND LIBFTDIPP_LIBRARIES ${LIBUSB_LIBRARIES} )
 endif ()
@@ -206,8 +208,8 @@ if(CMAKE_VERSION VERSION_LESS 2.8.8)
   configure_file ( cmake/LibFTDI1Config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/LibFTDI1Config.cmake @ONLY )
   configure_file ( cmake/LibFTDI1ConfigVersion.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/LibFTDI1ConfigVersion.cmake @ONLY )
 else ()
-  include(CMakePackageConfigHelpers)    
-  
+  include(CMakePackageConfigHelpers)
+
   configure_package_config_file (
     cmake/LibFTDI1Config.cmake.in
     ${CMAKE_CURRENT_BINARY_DIR}/LibFTDI1Config.cmake
@@ -224,19 +226,19 @@ else ()
     LibFTDI1ConfigVersion.cmake 
     VERSION ${LIBFTDI_VERSION_STRING} 
     COMPATIBILITY AnyNewerVersion
-  ) 
-endif ()        
+  )
+endif ()
 
 
 install ( FILES 
             ${CMAKE_CURRENT_BINARY_DIR}/LibFTDI1Config.cmake
             ${CMAKE_CURRENT_BINARY_DIR}/LibFTDI1ConfigVersion.cmake
             cmake/UseLibFTDI1.cmake
-            
+
           DESTINATION ${LIBFTDI_CMAKE_CONFIG_DIR}
         )
 
 
-        
-        
+
+
 include(CPack)