diff options
| author | Robert Adam <dev@robert-adam.de> | 2022-01-21 23:20:54 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-21 23:20:54 +0300 |
| commit | db3a280585ae0fb7798f18ba6487644e0b97802d (patch) | |
| tree | 376e8848ab687cd57c557e31b46627c2dd9e7bcb | |
| parent | e504c9711ce58b9133de711d84ad79f838b4864c (diff) | |
| parent | 904bae159d519474e82525c616167b0b2cac592a (diff) | |
Merge PR #5487: BUILD(client): Enable XInput2 support on OpenBSD by default
| -rw-r--r-- | docs/dev/build-instructions/cmake_options.md | 2 | ||||
| -rw-r--r-- | src/mumble/CMakeLists.txt | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/docs/dev/build-instructions/cmake_options.md b/docs/dev/build-instructions/cmake_options.md index 18c05202d..67dfed9b0 100644 --- a/docs/dev/build-instructions/cmake_options.md +++ b/docs/dev/build-instructions/cmake_options.md @@ -266,7 +266,7 @@ Build support for global shortcuts from Xbox controllers via the XInput DLL. ### xinput2 -Build support for XI2 +Build support for XI2. (Default: ON) ### zeroconf diff --git a/src/mumble/CMakeLists.txt b/src/mumble/CMakeLists.txt index 27792be6d..a2c4b5cce 100644 --- a/src/mumble/CMakeLists.txt +++ b/src/mumble/CMakeLists.txt @@ -53,7 +53,14 @@ elseif(UNIX) option(pipewire "Build support for PipeWire." ON) option(pulseaudio "Build support for PulseAudio." ON) option(speechd "Build support for Speech Dispatcher." ON) - option(xinput2 "Build support for XI2" ON) + endif() + + # scripts/generate_cmake_options_docs.py does not cope with duplicate option() lines, + # so single out common options into combined conditions. + # https://github.com/mumble-voip/mumble/issues/5488 + if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR + ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD") + option(xinput2 "Build support for XI2." ON) endif() endif() |