Fix typo in error message

[libftdi] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1a09e9e..9c7a6a5 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ set(MINOR_VERSION 0)
 set(PACKAGE libftdi1)
 set(VERSION_STRING ${MAJOR_VERSION}.${MINOR_VERSION})
 set(VERSION ${VERSION_STRING})
-SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}")
+set ( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake )
 
 # CMake
 if("${CMAKE_BUILD_TYPE}" STREQUAL "")
@@ -46,10 +46,14 @@ set(CPACK_COMPONENT_SHAREDLIBS_GROUP "Development")
 set(CPACK_COMPONENT_STATICLIBS_GROUP "Development")
 set(CPACK_COMPONENT_HEADERS_GROUP    "Development")
 
-# automatically set lib suffix
-if ( UNIX AND NOT APPLE AND NOT CMAKE_CROSSCOMPILING AND NOT EXISTS "/etc/debian_version" )
-  if ( CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT LIB_SUFFIX )
-    set ( LIB_SUFFIX 64 )
+option ( STATICLIBS "Build static libraries" ON )
+
+# guess LIB_SUFFIX, don't take debian multiarch into account 
+if ( NOT DEFINED LIB_SUFFIX )
+  if ( CMAKE_SYSTEM_NAME MATCHES "Linux" AND NOT CMAKE_CROSSCOMPILING AND NOT EXISTS "/etc/debian_version" )
+    if ( "${CMAKE_SIZEOF_VOID_P}" EQUAL "8" )
+      set ( LIB_SUFFIX 64 )
+    endif ()
   endif ()
 endif ()
 
@@ -139,7 +143,7 @@ endif(DOCUMENTATION AND DOXYGEN_FOUND)
 
 add_subdirectory(src)
 add_subdirectory(ftdipp)
-add_subdirectory(bindings)
+add_subdirectory(python)
 add_subdirectory(ftdi_eeprom)
 add_subdirectory(examples)
 add_subdirectory(packages)
@@ -173,13 +177,18 @@ if ( UNIX )
     set ( LIBFTDI_CMAKE_CONFIG_DIR lib${LIB_SUFFIX}/cmake/libftdi1 )
   endif ()
   
-  get_target_property( _LIBFTDI_LIBRARY_LOCATION ftdi1 LOCATION )
-  get_filename_component ( _LIBFTDI_LIBRARY_NAME ${_LIBFTDI_LIBRARY_LOCATION} NAME )
   set ( LIBFTDI_INCLUDE_DIR ${includedir} )
   set ( LIBFTDI_INCLUDE_DIRS ${LIBFTDI_INCLUDE_DIR} )
+  get_target_property( _LIBFTDI_LIBRARY_LOCATION ftdi1 LOCATION )
+  get_filename_component ( _LIBFTDI_LIBRARY_NAME ${_LIBFTDI_LIBRARY_LOCATION} NAME )
   set ( LIBFTDI_LIBRARY ${libdir}/${_LIBFTDI_LIBRARY_NAME} )
   set ( LIBFTDI_LIBRARIES ${LIBFTDI_LIBRARY} )
   list ( APPEND LIBFTDI_LIBRARIES ${LIBUSB_LIBRARIES} )
+  get_target_property( _LIBFTDIPP_LIBRARY_LOCATION ftdipp1 LOCATION )
+  get_filename_component ( _LIBFTDIPP_LIBRARY_NAME ${_LIBFTDIPP_LIBRARY_LOCATION} NAME )
+  set ( LIBFTDIPP_LIBRARY ${libdir}/${_LIBFTDIPP_LIBRARY_NAME} )
+  set ( LIBFTDIPP_LIBRARIES ${LIBFTDIPP_LIBRARY} )
+  list ( APPEND LIBFTDIPP_LIBRARIES ${LIBUSB_LIBRARIES} )
   set ( LIBFTDI_ROOT_DIR ${prefix} )
   set ( LIBFTDI_VERSION_STRING ${VERSION_STRING} )
   set ( LIBFTDI_VERSION_MAJOR ${MAJOR_VERSION} )