X-Git-Url: http://developer.intra2net.com/git/?p=libftdi;a=blobdiff_plain;f=CMakeLists.txt;h=49e23bcceeba2ce835e8b09e20d31ca523629742;hp=1e74b7fd9c478441bd790c348d7e668767eb68d6;hb=17eb1c4e036dc787ef18b0a80ca93fc2c3f27fbf;hpb=016ad174031f03588b526ba873c6e14343199dab

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1e74b7f..49e23bc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Project
 project(libftdi1)
 set(MAJOR_VERSION 1)
-set(MINOR_VERSION 0)
+set(MINOR_VERSION 1)
 set(PACKAGE libftdi1)
 set(VERSION_STRING ${MAJOR_VERSION}.${MINOR_VERSION})
 set(VERSION ${VERSION_STRING})
@@ -50,7 +50,10 @@ 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_SYSTEM_NAME MATCHES "Linux"
+      AND NOT CMAKE_CROSSCOMPILING
+      AND NOT EXISTS "/etc/debian_version"
+      AND NOT EXISTS "/etc/arch-release" )
     if ( "${CMAKE_SIZEOF_VOID_P}" EQUAL "8" )
       set ( LIB_SUFFIX 64 )
     endif ()
@@ -167,38 +170,40 @@ configure_file(${CMAKE_SOURCE_DIR}/libftdipp1.pc.in ${CMAKE_BINARY_DIR}/libftdip
 install(FILES ${CMAKE_BINARY_DIR}/libftdi1.pc ${CMAKE_BINARY_DIR}/libftdipp1.pc
         DESTINATION lib${LIB_SUFFIX}/pkgconfig)
 
-if ( UNIX )
+if (UNIX OR MINGW)
   configure_file ( libftdi1-config.in ${CMAKE_CURRENT_BINARY_DIR}/libftdi1-config @ONLY )
   install ( PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/libftdi1-config
             DESTINATION bin )
+endif ()
 
-  # config script install path
-  if ( NOT DEFINED LIBFTDI_CMAKE_CONFIG_DIR )
-    set ( LIBFTDI_CMAKE_CONFIG_DIR lib${LIB_SUFFIX}/cmake/libftdi1 )
-  endif ()
-  
-  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} )
+# config script install path
+if ( NOT DEFINED LIBFTDI_CMAKE_CONFIG_DIR )
+  set ( LIBFTDI_CMAKE_CONFIG_DIR lib${LIB_SUFFIX}/cmake/libftdi1 )
+endif ()
+
+set ( LIBFTDI_INCLUDE_DIR ${includedir} )
+set ( LIBFTDI_INCLUDE_DIRS ${LIBFTDI_INCLUDE_DIR} )
+set ( LIBFTDI_LIBRARY ftdi1 )
+set ( LIBFTDI_LIBRARIES ${LIBFTDI_LIBRARY} )
+list ( APPEND LIBFTDI_LIBRARIES ${LIBUSB_LIBRARIES} )
+set ( LIBFTDI_STATIC_LIBRARY ftdi1.a )
+set ( LIBFTDI_STATIC_LIBRARIES ${LIBFTDI_LIBRARY} )
+list ( APPEND LIBFTDI_STATIC_LIBRARIES ${LIBUSB_LIBRARIES} )
+if (FTDI_BUILD_CPP)
+  set ( LIBFTDIPP_LIBRARY ftdi1pp )
   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} )
-  set ( LIBFTDI_VERSION_MINOR ${MINOR_VERSION} )
-  
-  set ( LIBFTDI_USE_FILE ${CMAKE_INSTALL_PREFIX}/${LIBFTDI_CMAKE_CONFIG_DIR}/UseLibFTDI1.cmake )
-  configure_file ( LibFTDI1Config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/LibFTDI1Config.cmake @ONLY )
-  install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/LibFTDI1Config.cmake cmake/UseLibFTDI1.cmake
-            DESTINATION ${LIBFTDI_CMAKE_CONFIG_DIR}
-          )
 endif ()
+set ( LIBFTDI_LIBRARY_DIRS ${libdir} )
+set ( LIBFTDI_ROOT_DIR ${prefix} )
+set ( LIBFTDI_VERSION_STRING ${VERSION_STRING} )
+set ( LIBFTDI_VERSION_MAJOR ${MAJOR_VERSION} )
+set ( LIBFTDI_VERSION_MINOR ${MINOR_VERSION} )
+
+set ( LIBFTDI_USE_FILE ${CMAKE_INSTALL_PREFIX}/${LIBFTDI_CMAKE_CONFIG_DIR}/UseLibFTDI1.cmake )
+configure_file ( cmake/LibFTDI1Config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/LibFTDI1Config.cmake @ONLY )
+install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/LibFTDI1Config.cmake cmake/UseLibFTDI1.cmake
+          DESTINATION ${LIBFTDI_CMAKE_CONFIG_DIR}
+        )
 
 include(CPack)