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

[libftdi] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7965999..9fd86a6 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,42 +1,55 @@
 # Includes
-include_directories( ${CMAKE_CURRENT_BINARY_DIR}
+include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}
                      ${CMAKE_CURRENT_SOURCE_DIR}
                      )
 
-# Targets
-set(c_sources     ftdi.c)
-set(c_headers     ftdi.h)
-
-add_library(ftdi SHARED ${c_sources})
-
-# Dependencies
-target_link_libraries(ftdi ${LIBUSB_LIBRARIES})
+# Version information
+set(SNAPSHOT_VERSION "unknown")
+execute_process(COMMAND git describe
+                OUTPUT_VARIABLE GIT_DESCRIBE_OUTPUT
+                RESULT_VARIABLE GIT_DESCRIBE_RESULT
+                OUTPUT_STRIP_TRAILING_WHITESPACE
+                )
+if(${GIT_DESCRIBE_RESULT} STREQUAL 0)
+  set(SNAPSHOT_VERSION ${GIT_DESCRIBE_OUTPUT})
+endif ()
+message(STATUS "Detected git snapshot version: ${SNAPSHOT_VERSION}")
 
-# Install
-if(${UNIX})
+configure_file(ftdi_version_i.h.in "${CMAKE_CURRENT_BINARY_DIR}/ftdi_version_i.h" @ONLY)
 
-   install( TARGETS ftdi
-            LIBRARY DESTINATION lib
-            COMPONENT sharedlibs
-            )
-
-   install( FILES ${c_headers}
-            DESTINATION include/${PROJECT_NAME}
-            COMPONENT headers
-            )
-
-endif(${UNIX})
+# Targets
+set(c_sources     ${CMAKE_CURRENT_SOURCE_DIR}/ftdi.c ${CMAKE_CURRENT_SOURCE_DIR}/ftdi_stream.c CACHE INTERNAL "List of c sources" )
+set(c_headers     ${CMAKE_CURRENT_SOURCE_DIR}/ftdi.h CACHE INTERNAL "List of c headers" )
 
-if(${WIN32})
+add_library(ftdi1 SHARED ${c_sources})
 
-   install( TARGETS ftdi
-            DESTINATION bin
-            COMPONENT sharedlibs
-            )
+math(EXPR VERSION_FIXUP "${MAJOR_VERSION} + 1")    # Compatiblity with previous releases
+set_target_properties(ftdi1 PROPERTIES VERSION ${VERSION_FIXUP}.${MINOR_VERSION}.0 SOVERSION 2)
+# Prevent clobbering each other during the build
+set_target_properties ( ftdi1 PROPERTIES CLEAN_DIRECT_OUTPUT 1 )
 
-   install( FILES ${c_headers}
-            DESTINATION include/${PROJECT_NAME}
-            COMPONENT headers
-            )
 
-endif(${WIN32})
+# Dependencies
+target_link_libraries(ftdi1 ${LIBUSB_LIBRARIES})
+
+install ( TARGETS ftdi1
+          RUNTIME DESTINATION bin
+          LIBRARY DESTINATION lib${LIB_SUFFIX}
+          ARCHIVE DESTINATION lib${LIB_SUFFIX}
+        )
+
+if ( STATICLIBS )
+  add_library(ftdi1-static STATIC ${c_sources})
+  target_link_libraries(ftdi1-static ${LIBUSB_LIBRARIES})
+  set_target_properties(ftdi1-static PROPERTIES OUTPUT_NAME "ftdi1")
+  set_target_properties(ftdi1-static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+  install ( TARGETS ftdi1-static
+            ARCHIVE DESTINATION lib${LIB_SUFFIX}
+            COMPONENT staticlibs
+          )
+endif ()
+
+install ( FILES ${c_headers}
+          DESTINATION include/${PROJECT_NAME}
+          COMPONENT headers
+        )