X-Git-Url: http://developer.intra2net.com/git/?p=libftdi;a=blobdiff_plain;f=CMakeLists.txt;h=49e23bcceeba2ce835e8b09e20d31ca523629742;hp=f4feecdb6568360149fbcd630096660e9cd9e7bf;hb=3e8e2d735dbe299b704a7b06c1f989fb89fcba2f;hpb=85c20de2dec30e8d72aa991fea8e52fb7a996e91

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f4feecd..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,21 +183,18 @@ 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} )
-if (WIN32)
-  set (LIBFTDI_LIBRARY ${CMAKE_INSTALL_PREFIX}/lib/${_LIBFTDI_LIBRARY_NAME}.a)
-endif ()
+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)
-  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_LIBRARY ftdi1pp )
   set ( LIBFTDIPP_LIBRARIES ${LIBFTDIPP_LIBRARY} )
   list ( APPEND LIBFTDIPP_LIBRARIES ${LIBUSB_LIBRARIES} )
 endif ()
+set ( LIBFTDI_LIBRARY_DIRS ${libdir} )
 set ( LIBFTDI_ROOT_DIR ${prefix} )
 set ( LIBFTDI_VERSION_STRING ${VERSION_STRING} )
 set ( LIBFTDI_VERSION_MAJOR ${MAJOR_VERSION} )