X-Git-Url: http://developer.intra2net.com/git/?p=libftdi;a=blobdiff_plain;f=CMakeLists.txt;h=a9fdf5cd6e8bf8d5c517fdbb39446cc4eb4607b3;hp=08e5771a7dc5e88abbf8f9007f15aa591b5deb5b;hb=195ec69650203868ffac02d7a92248688be3c9b1;hpb=329ab28dddd1cfb48dea560c3443a157177e6b50 diff --git a/CMakeLists.txt b/CMakeLists.txt index 08e5771..a9fdf5c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ # Project project(libftdi1) set(MAJOR_VERSION 1) -set(MINOR_VERSION 1) +set(MINOR_VERSION 2) set(PACKAGE libftdi1) set(VERSION_STRING ${MAJOR_VERSION}.${MINOR_VERSION}) set(VERSION ${VERSION_STRING}) @@ -113,6 +113,8 @@ add_custom_target(dist | bzip2 > ${CMAKE_BINARY_DIR}/${ARCHIVE_NAME}.tar.bz2 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) +# Tests +option ( BUILD_TESTS "Build unit tests with Boost Unit Test framework" ON ) # Documentation option ( DOCUMENTATION "Generate API documentation with Doxygen" ON ) @@ -190,7 +192,7 @@ set ( LIBFTDI_STATIC_LIBRARY ftdi1.a ) set ( LIBFTDI_STATIC_LIBRARIES ${LIBFTDI_STATIC_LIBRARY} ) list ( APPEND LIBFTDI_STATIC_LIBRARIES ${LIBUSB_LIBRARIES} ) if (FTDI_BUILD_CPP) - set ( LIBFTDIPP_LIBRARY ftdi1pp ) + set ( LIBFTDIPP_LIBRARY ftdipp1 ) set ( LIBFTDIPP_LIBRARIES ${LIBFTDIPP_LIBRARY} ) list ( APPEND LIBFTDIPP_LIBRARIES ${LIBUSB_LIBRARIES} ) endif ()