X-Git-Url: http://developer.intra2net.com/git/?p=libftdi;a=blobdiff_plain;f=CMakeLists.txt;h=d20aa94cfec22e0752ff163d99801770747e438b;hp=5aecafcbc5d42b9b9f214079696b7cc2a7adb584;hb=b5b8fab6063ad90bb5ef05a72708ecde1796bc81;hpb=5c2c58e03ea999534e8cb64906c8ae8b15536c30 diff --git a/CMakeLists.txt b/CMakeLists.txt index 5aecafc..d20aa94 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,8 +25,16 @@ if(${CMAKE_BUILD_TYPE} STREQUAL Debug) endif(${CMAKE_BUILD_TYPE} STREQUAL Debug) # find libusb -find_package ( USB1 REQUIRED ) -include_directories ( ${LIBUSB_INCLUDE_DIR} ) +find_package( PkgConfig ) +if (PkgConfig_FOUND) + pkg_check_modules( LIBUSB libusb-1.0 ) + if (LIBUSB_FOUND) + include_directories ( ${LIBUSB_INCLUDE_DIRS} ) + else() + find_package ( USB1 REQUIRED ) + include_directories ( ${LIBUSB_INCLUDE_DIR} ) + endif() +endif() # Find Boost if (FTDIPP OR BUILD_TESTS) @@ -136,7 +144,7 @@ endif () add_subdirectory(src) if ( FTDIPP ) - project(libftdipp1 C CXX) + project(libftdi1 C CXX) add_subdirectory(ftdipp) endif () if ( PYTHON_BINDINGS ) @@ -150,6 +158,7 @@ if ( EXAMPLES ) endif () add_subdirectory(packages) if ( BUILD_TESTS ) + project(libftdi1 C CXX) add_subdirectory(test) endif ()