diff options
| author | Ameer <aj662@drexel.edu> | 2020-07-08 21:15:49 -0400 |
|---|---|---|
| committer | Ameer <aj662@drexel.edu> | 2020-07-08 21:15:49 -0400 |
| commit | 4489ea6f532a501ca4cc379d8d8fb50ce1af27d7 (patch) | |
| tree | 52f62331d39f338f6ae6d0fd56831bdd577943a9 /CMakeLists.txt | |
| parent | b57475887be5879347d5fda425676d0bd2e2a3d3 (diff) | |
| parent | 5311b562aa3c619dca9a1a14d0a2b16281a45cc1 (diff) | |
Rebase to master, fix merge conflicts
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 27383bce8..cd40e5cfe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -331,8 +331,10 @@ endif() # Ensure libusb is properly configured (based on dolphin libusb include) find_package(LibUSB) -add_subdirectory(externals/libusb) -set(LIBUSB_LIBRARIES usb) +if (NOT LIBUSB_FOUND) + add_subdirectory(externals/libusb) + set(LIBUSB_LIBRARIES usb) +endif() # Prefer the -pthread flag on Linux. |