summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorR. van Twisk <ries.van.twisk@ing.com>2019-12-25 14:21:37 +0100
committerR. van Twisk <ries.van.twisk@ing.com>2019-12-25 14:21:37 +0100
commita061e9ef4aa60c251f8c42052fe9ef6eefe896e0 (patch)
tree88e682c0a2705a10f7c1be4ef2d8ef8ba49c5db8
parent904ebd5a8ad3e2edc60db8852ef9a5af623321b1 (diff)
Revert changes to video-ps3eye
-rw-r--r--.gitignore1
-rw-r--r--video-ps3eye/CMakeLists.txt12
2 files changed, 9 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index db6619b1..c8503cb5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
/CMakeSettings.json
.gtm/
.vscode
+.history
diff --git a/video-ps3eye/CMakeLists.txt b/video-ps3eye/CMakeLists.txt
index 5adcf2b0..d42c83ff 100644
--- a/video-ps3eye/CMakeLists.txt
+++ b/video-ps3eye/CMakeLists.txt
@@ -4,9 +4,13 @@ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ps3eye-driver/CMakeLists.txt")
add_subdirectory("ps3eye-driver")
if(NOT MSVC)
- find_package(LibUSB REQUIRED)
- include_directories(SYSTEM ${LibUSB_INCLUDE_DIRS})
- link_libraries(${LibUSB_LIBRARIES} -pthread)
+ if(PKG_CONFIG_FOUND)
+ pkg_check_modules(libusb "libusb-1.0" QUIET)
+ endif()
+ if(libusb_FOUND)
+ include_directories(SYSTEM ${libusb_INCLUDE_DIRS})
+ link_libraries(${libusb_LIBRARIES})
+ endif()
else()
set(SDK_LIBUSB CACHE PATH "")
if(SDK_LIBUSB)
@@ -49,4 +53,4 @@ endif()
if(TARGET ps3eye-frame-test)
install(TARGETS "ps3eye-frame-test" DESTINATION "${opentrack-hier-pfx}")
-endif()
+endif() \ No newline at end of file