summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Jan Beich2020-07-09 14:56:56 +0000
committerGravatar Jan Beich2020-07-09 15:26:54 +0000
commit48ff15602e89ee2b7946310dd343859d56795a67 (patch)
treef7a5d0e84ef975ee6cc2b17046b08fdd3f3cbe2b
parentMerge pull request #4219 from ogniK5377/audio-timing (diff)
downloadyuzu-48ff15602e89ee2b7946310dd343859d56795a67.tar.gz
yuzu-48ff15602e89ee2b7946310dd343859d56795a67.tar.xz
yuzu-48ff15602e89ee2b7946310dd343859d56795a67.zip
cmake: pass libusb include directory as well
In file included from src/input_common/gcadapter/gc_adapter.cpp:8: src/./input_common/gcadapter/gc_adapter.h:11:10: fatal error: 'libusb.h' file not found #include <libusb.h> ^~~~~~~~~~
-rw-r--r--CMakeLists.txt1
-rw-r--r--src/input_common/CMakeLists.txt1
2 files changed, 2 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cd40e5cfe..eb51d09dc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -333,6 +333,7 @@ endif()
333find_package(LibUSB) 333find_package(LibUSB)
334if (NOT LIBUSB_FOUND) 334if (NOT LIBUSB_FOUND)
335 add_subdirectory(externals/libusb) 335 add_subdirectory(externals/libusb)
336 set(LIBUSB_INCLUDE_DIR "")
336 set(LIBUSB_LIBRARIES usb) 337 set(LIBUSB_LIBRARIES usb)
337endif() 338endif()
338 339
diff --git a/src/input_common/CMakeLists.txt b/src/input_common/CMakeLists.txt
index 3bd76dd23..1d7e19a66 100644
--- a/src/input_common/CMakeLists.txt
+++ b/src/input_common/CMakeLists.txt
@@ -30,6 +30,7 @@ if(SDL2_FOUND)
30 target_compile_definitions(input_common PRIVATE HAVE_SDL2) 30 target_compile_definitions(input_common PRIVATE HAVE_SDL2)
31endif() 31endif()
32 32
33target_include_directories(input_common SYSTEM PUBLIC ${LIBUSB_INCLUDE_DIR})
33target_link_libraries(input_common PUBLIC ${LIBUSB_LIBRARIES}) 34target_link_libraries(input_common PUBLIC ${LIBUSB_LIBRARIES})
34 35
35create_target_directory_groups(input_common) 36create_target_directory_groups(input_common)