X-Git-Url: http://developer.intra2net.com/git/?p=libftdi;a=blobdiff_plain;f=CMakeLists.txt;h=49e23bcceeba2ce835e8b09e20d31ca523629742;hp=c5d7e42daaee6fd31516642621d059f67f3bc0ec;hb=17eb1c4e036dc787ef18b0a80ca93fc2c3f27fbf;hpb=0ce1c5662d50affed25983a67185d41814954a81 diff --git a/CMakeLists.txt b/CMakeLists.txt index c5d7e42..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}) @@ -183,11 +183,12 @@ 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 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} )