Ignore LIBUSB_FOUND on Apple
It shouldn't be set in the first place, and its cached value is screwing up the buildbots.
This commit is contained in:
parent
a403e37901
commit
eb4d980d2f
|
@ -738,18 +738,20 @@ if(ENABLE_SDL)
|
||||||
endif(SDL2_FOUND)
|
endif(SDL2_FOUND)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(NOT APPLE)
|
if(NOT ANDROID)
|
||||||
find_package(LibUSB)
|
add_definitions(-D__LIBUSB__)
|
||||||
|
if(NOT APPLE)
|
||||||
|
find_package(LibUSB)
|
||||||
|
endif()
|
||||||
|
if(LIBUSB_FOUND AND NOT APPLE)
|
||||||
|
message("Using shared LibUSB")
|
||||||
|
include_directories(${LIBUSB_INCLUDE_DIR})
|
||||||
|
else()
|
||||||
|
message("Using static LibUSB from Externals")
|
||||||
|
add_subdirectory(Externals/libusb)
|
||||||
|
set(LIBUSB_LIBRARIES usb)
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
add_definitions(-D__LIBUSB__)
|
|
||||||
if(LIBUSB_FOUND)
|
|
||||||
message("Using shared LibUSB")
|
|
||||||
include_directories(${LIBUSB_INCLUDE_DIR})
|
|
||||||
else()
|
|
||||||
message("Using static LibUSB from Externals")
|
|
||||||
add_subdirectory(Externals/libusb)
|
|
||||||
set(LIBUSB_LIBRARIES usb)
|
|
||||||
endif(LIBUSB_FOUND)
|
|
||||||
|
|
||||||
set(SFML_REQD_VERSION 2.1)
|
set(SFML_REQD_VERSION 2.1)
|
||||||
if(NOT APPLE)
|
if(NOT APPLE)
|
||||||
|
|
Loading…
Reference in New Issue