ishcherb / rpms / openambit

Forked from rpms/openambit 6 years ago
Clone
fea961a
From 1cd9130ed0819916e0c1edbd9f39c4dd0d82f0b5 Mon Sep 17 00:00:00 2001
fea961a
From: Sandro Mani <manisandro@gmail.com>
fea961a
Date: Tue, 27 Jan 2015 14:12:19 +0100
fea961a
Subject: [PATCH] Unbundle hidapi
fea961a
fea961a
---
fea961a
 src/libambit/CMakeLists.txt | 9 +++++----
fea961a
 1 file changed, 5 insertions(+), 4 deletions(-)
fea961a
fea961a
diff --git a/src/libambit/CMakeLists.txt b/src/libambit/CMakeLists.txt
fea961a
index 93b5042..cb2f74e 100644
fea961a
--- a/src/libambit/CMakeLists.txt
fea961a
+++ b/src/libambit/CMakeLists.txt
fea961a
@@ -15,9 +15,11 @@ IF (DEFINED DEBUG_PRINT_FILE_LINE)
fea961a
   set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DDEBUG_PRINT_FILE_LINE=${DEBUG_PRINT_FILE_LINE}")
fea961a
 ENDIF()
fea961a
 
fea961a
-include(HidapiDriver)
fea961a
 include(GNUInstallDirs)
fea961a
 
fea961a
+find_package(PkgConfig)
fea961a
+pkg_check_modules(HIDAPI REQUIRED hidapi-hidraw)
fea961a
+
fea961a
 add_library (
fea961a
   ambit
fea961a
   SHARED
fea961a
@@ -34,19 +36,18 @@ add_library (
fea961a
   sbem0102.c
fea961a
   sha256.c
fea961a
   utils.c
fea961a
-  ${HIDAPI_SOURCE_FILES}
fea961a
 )
fea961a
 
fea961a
 target_link_libraries(
fea961a
   ambit
fea961a
-  ${HIDAPI_LIBS}
fea961a
+  ${HIDAPI_LIBRARIES}
fea961a
   m
fea961a
 )
fea961a
 
fea961a
 set_target_properties(ambit PROPERTIES VERSION 0.3.0 SOVERSION 0)
fea961a
 
fea961a
 include_directories(
fea961a
-  ${HIDAPI_INCLUDE_DIR}
fea961a
+  ${HIDAPI_INCLUDE_DIRS}
fea961a
 )
fea961a
 
fea961a
 install(TARGETS ambit DESTINATION ${CMAKE_INSTALL_LIBDIR})
fea961a
-- 
fea961a
2.2.2
fea961a