X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=CMakeLists.txt;fp=CMakeLists.txt;h=d26f03c8ffe7f490164d74c4e40937ea02069637;hb=d15a2535cae3a76608fe9e7b3a7da27f409fa400;hp=cd329bb18e5fb32b4f2d4b027762eceaf0059d3a;hpb=e653ca6cdf7f63dd70f748f970c1e0345bc19946;p=fw%2Fstlink diff --git a/CMakeLists.txt b/CMakeLists.txt index cd329bb..d26f03c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,9 @@ cmake_minimum_required(VERSION 2.8.7) include(CheckCCompilerFlag) find_package(PkgConfig) -pkg_check_modules(libusb REQUIRED libusb-1.0) +set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_SOURCE_DIR}/cmake/modules") + +find_package(LibUSB REQUIRED) pkg_check_modules(gtk gtk+-3.0) function(add_cflag_if_supported flag) @@ -57,14 +59,14 @@ set(CFILES src/stlink-common.c src/uglylogging.c ) -include_directories(${libusb_INCLUDE_DIRS}) +include_directories(${LIBUSB_INCLUDE_DIR}) include_directories(src) include_directories(mingw) add_library(${PROJECT_NAME} STATIC ${HFILES} # header files for ide projects generated by cmake ${CFILES}) -target_link_libraries(${PROJECT_NAME} ${libusb_LDFLAGS}) +target_link_libraries(${PROJECT_NAME} ${LIBUSB_LIBRARIES}) add_executable(st-flash flash/main.c) target_link_libraries(st-flash ${PROJECT_NAME})