Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Adam <dev@robert-adam.de>2022-07-22 09:26:29 +0300
committerGitHub <noreply@github.com>2022-07-22 09:26:29 +0300
commitda8711f995ce5d90d4166b163a303585a0c41f42 (patch)
tree2fa579696b34a566ce96927f33e44bfa267b072d
parent93c13bdeea15c92f4590832b6bfd11c7dcfc86fa (diff)
parent382332c93b2524f5b4039a08925796196fb3e087 (diff)
Merge PR #5752: BUILD(cmake, overlay): Include missing CMake module
We use the CHECK_INCLUDE_FILE macro without previously including the corresponding CMake module. This usually still works as the Opus CMake files include the same module and apparently are loaded before processing the overlay CMakeLists.txt. Thus, thee Opus code fixes this issue for us by accident. However, when building without the bundled Opus version, this leads to a build error as in this case the Opus CMake scripts are not processed by us. Fixes #5742
-rw-r--r--overlay_gl/CMakeLists.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/overlay_gl/CMakeLists.txt b/overlay_gl/CMakeLists.txt
index 08c19f625..4beb157b3 100644
--- a/overlay_gl/CMakeLists.txt
+++ b/overlay_gl/CMakeLists.txt
@@ -5,6 +5,8 @@
# Overlay payload for UNIX-like systems.
+include(CheckIncludeFile)
+
if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "amd64")
if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
option(overlay-xcompile "Build 32 bit overlay library, necessary for the overlay to work with 32 bit processes." ON)