diff options
| author | Robert Adam <dev@robert-adam.de> | 2021-04-25 21:22:43 +0300 |
|---|---|---|
| committer | Robert Adam <dev@robert-adam.de> | 2021-05-13 15:10:00 +0300 |
| commit | 19e16a0524876c3b29f59e9844c650d1a2a7ba73 (patch) | |
| tree | 88e58f1b50c6635e8bba08db4d40cb7965ec8023 /CMakeLists.txt | |
| parent | f7886d29a3a2ee4b3ff5eb0229210894092ede86 (diff) | |
BUILD(cmake): Bundle Qt translations
In the old qmake build system we included the functionality to bundle Qt
translations into our executable (potentially overwriting some of them).
See https://github.com/mumble-voip/mumble/blob/f5bf5f17f3c207bb18ecd2dfc9ccdfa3136b6c7f/src/mumble/mumble.pro#L692-L728
This functionality was not ported over to cmake which could lead to Qt
standard texts (e.g. "Ok") not being translated.
This commit ports the old functionality to the new cmake build system.
Note however that this new functionality is only enabled by default, if
a static build of Mumble is created. In other instances the option can
be specified manually.
Fixes #4359
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9a3ea9e4e..7878a1612 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,9 @@ cmake_minimum_required(VERSION 3.15) cmake_policy(SET CMP0079 NEW) cmake_policy(SET CMP0091 NEW) -cmake_policy(SET CMP0118 NEW) +if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.20.0") + cmake_policy(SET CMP0118 NEW) +endif() set(BUILD_NUMBER CACHE STRING "The build number of the current build. Will be used in Mumble's version to make sure newer builds upgrade older installations properly.") set(RELEASE_ID CACHE STRING "The ID of the current release (used for representation in the UI and the updater)") @@ -39,6 +41,7 @@ set(CMAKE_OSX_DEPLOYMENT_TARGET 10.9) list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" "${CMAKE_SOURCE_DIR}/cmake/FindModules" + "${3RDPARTY_DIR}/FindPythonInterpreter" ) |