ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5368 from ligfx/bluezcmake 

CMake: only look for Bluez on Linux
This commit is contained in:
Tilka 2017-05-04 00:32:44 +01:00 committed by GitHub
parent b0fdd81f45 5230a8c996
commit 2c817545fd
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -24,7 +24,6 @@ option(ENABLE_ALSA "Enables ALSA sound backend" ON)
option(ENABLE_PULSEAUDIO "Enables PulseAudio sound backend" ON) option(ENABLE_PULSEAUDIO "Enables PulseAudio sound backend" ON)
option(ENABLE_OPENAL "Enables OpenAL sound backend" ON) option(ENABLE_OPENAL "Enables OpenAL sound backend" ON)
option(ENABLE_LLVM "Enables LLVM support, for disassembly" ON) option(ENABLE_LLVM "Enables LLVM support, for disassembly" ON)
option(ENABLE_BLUEZ "Enables bluetooth support" ON)
# Maintainers: if you consider blanket disabling this for your users, please # Maintainers: if you consider blanket disabling this for your users, please
# consider the following points: # consider the following points:

5
Source/Core/Core/CMakeLists.txt
View File

@ -326,7 +326,9 @@ elseif(UNIX)
endif() endif()
# Bluez doesn't support all the communication modes on FreeBSD, so only using it on Linux # Bluez doesn't support all the communication modes on FreeBSD, so only using it on Linux
if(ENABLE_BLUEZ AND CMAKE_SYSTEM_NAME MATCHES "Linux") if(CMAKE_SYSTEM_NAME MATCHES "Linux")
option(ENABLE_BLUEZ "Enables bluetooth support" ON)
if(ENABLE_BLUEZ)
find_package(BlueZ) find_package(BlueZ)
if(BLUEZ_FOUND) if(BLUEZ_FOUND)
message(STATUS "BlueZ found, enabling bluetooth support") message(STATUS "BlueZ found, enabling bluetooth support")
@ -339,6 +341,7 @@ if(ENABLE_BLUEZ AND CMAKE_SYSTEM_NAME MATCHES "Linux")
else() else()
message(STATUS "BlueZ explicitly disabled, disabling bluetooth support") message(STATUS "BlueZ explicitly disabled, disabling bluetooth support")
endif() endif()
endif()
if(HIDAPI_FOUND) if(HIDAPI_FOUND)
set(SRCS ${SRCS} HW/WiimoteReal/IOhidapi.cpp) set(SRCS ${SRCS} HW/WiimoteReal/IOhidapi.cpp)