From: Michel Zou Date: Thu, 24 Jan 2013 10:59:21 +0000 (+0100) Subject: Add C++ wrapper config vars. X-Git-Tag: v1.0rc3~2 X-Git-Url: http://developer.intra2net.com/git/?p=libftdi;a=commitdiff_plain;h=74cdff9844d0770ad5961861a17975ac71d38d92 Add C++ wrapper config vars. --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 1a09e9e..0bad0d7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -173,13 +173,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} ) diff --git a/LibFTDI1Config.cmake.in b/LibFTDI1Config.cmake.in index 679c1c2..6146bc0 100644 --- a/LibFTDI1Config.cmake.in +++ b/LibFTDI1Config.cmake.in @@ -18,7 +18,9 @@ # LIBFTDI_INCLUDE_DIRS - Directory where OT.hxx can be found # LIBFTDI_INCLUDE_DIRS - List of directories of LibFTDI and it's dependencies # LIBFTDI_LIBRARY - LibFTDI library location -# LIBFTDI_LIBRARIES - List of libraries to link against +# LIBFTDI_LIBRARIES - List of libraries to link against LibFTDI library +# LIBFTDIPP_LIBRARY - LibFTDI C++ wrapper library location +# LIBFTDIPP_LIBRARIES - List of libraries to link against LibFTDI C++ wrapper # LIBFTDI_LIBRARY_DIRS - List of directories containing LibFTDI' libraries # LIBFTDI_ROOT_DIR - The base directory of LibFTDI # LIBFTDI_VERSION_STRING - A human-readable string containing the version @@ -35,6 +37,8 @@ set ( LIBFTDI_INCLUDE_DIR "@LIBFTDI_INCLUDE_DIR@" ) set ( LIBFTDI_INCLUDE_DIRS "@LIBFTDI_INCLUDE_DIRS@" ) set ( LIBFTDI_LIBRARY "@LIBFTDI_LIBRARY@" ) set ( LIBFTDI_LIBRARIES "@LIBFTDI_LIBRARIES@" ) +set ( LIBFTDIPP_LIBRARY "@LIBFTDIPP_LIBRARY@" ) +set ( LIBFTDIPP_LIBRARIES "@LIBFTDIPP_LIBRARIES@" ) set ( LIBFTDI_LIBRARY_DIRS "@LIBFTDI_LIBRARY_DIRS@" ) set ( LIBFTDI_ROOT_DIR "@LIBFTDI_ROOT_DIR@" )