diff options
| author | Robert Adam <dev@robert-adam.de> | 2022-01-23 17:23:07 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-23 17:23:07 +0300 |
| commit | 6571d0cb03e5587d3f2d20982763345400e53138 (patch) | |
| tree | 1402a990bb96f3eb75483ecb69fc8b9485acb0bf | |
| parent | 361e1b02f698f2d83b6efca17434a01ae519e2a5 (diff) | |
| parent | 22f1fa8752c8b17814a381eca863ca829e3790d7 (diff) | |
Merge PR #5503: BUILD(client): CELT: Require version 0.7.x when using the system library
The bundled version is 0.7.0 and versions >0.7.x are NOT supported.
At least on OpenBSD (only packaging 0.11.x), the built would fail.
Yield and error at configure time with this fix.
CMake's find_package() function accepts an optional version argument
but Mumble's find_pkg() wrapper does not (treating it as package), so
roll our own check/error:
-- celt found | Version: 0.11.1
CMake Error at src/mumble/CMakeLists.txt:677 (message):
CELT 0.7.x is required, found 0.11.1!
Relates to #4476.
| -rw-r--r-- | src/mumble/CMakeLists.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mumble/CMakeLists.txt b/src/mumble/CMakeLists.txt index a2c4b5cce..3bba8d66f 100644 --- a/src/mumble/CMakeLists.txt +++ b/src/mumble/CMakeLists.txt @@ -693,6 +693,10 @@ if(bundled-celt) install_library(celt mumble_client) else() find_pkg(celt REQUIRED) + if(${celt_VERSION} VERSION_LESS 0.7 OR + ${celt_VERSION} VERSION_GREATER_EQUAL 0.8) + message(FATAL_ERROR "CELT 0.7.x is required, found ${celt_VERSION}!") + endif() target_include_directories(mumble PRIVATE ${celt_INCLUDE_DIRS}) endif() |