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>2021-03-04 13:45:37 +0300
committerRobert Adam <dev@robert-adam.de>2021-03-06 20:57:22 +0300
commitb63adf6e860ff12a85e339d2e0499ae14f574c49 (patch)
tree82b5c6e2bfe18940453a8e37bea7334bd88fd14e /3rdparty
parent678e872c2124ec5175106616881f7df41be66647 (diff)
BUILD(cmake): Make unity builds possible
This commit explicitly excludes certain targets from being built in a unity build (or rather they continue to get built normally) as they cause compilation errors in these kind of builds.
Diffstat (limited to '3rdparty')
-rw-r--r--3rdparty/celt-0.7.0-build/CMakeLists.txt3
-rw-r--r--3rdparty/mach-override-build/CMakeLists.txt3
-rw-r--r--3rdparty/speex-build/CMakeLists.txt3
3 files changed, 9 insertions, 0 deletions
diff --git a/3rdparty/celt-0.7.0-build/CMakeLists.txt b/3rdparty/celt-0.7.0-build/CMakeLists.txt
index 20453cd89..1a5331d98 100644
--- a/3rdparty/celt-0.7.0-build/CMakeLists.txt
+++ b/3rdparty/celt-0.7.0-build/CMakeLists.txt
@@ -11,6 +11,9 @@ endif()
add_library(celt SHARED)
+# Celt doesn't work in unity builds
+set_target_properties(celt PROPERTIES UNITY_BUILD FALSE)
+
set_target_properties(celt PROPERTIES VERSION "0.7.0")
target_compile_definitions(celt PRIVATE "HAVE_CONFIG_H")
diff --git a/3rdparty/mach-override-build/CMakeLists.txt b/3rdparty/mach-override-build/CMakeLists.txt
index ab38816be..534b54a63 100644
--- a/3rdparty/mach-override-build/CMakeLists.txt
+++ b/3rdparty/mach-override-build/CMakeLists.txt
@@ -10,6 +10,9 @@ endif()
add_library(mach-override STATIC)
+# mach-override doesn't work in unity builds
+set_target_properties(mach-override PROPERTIES UNITY_BUILD FALSE)
+
target_include_directories(mach-override PUBLIC SYSTEM ${SRC_DIR})
target_sources(mach-override
diff --git a/3rdparty/speex-build/CMakeLists.txt b/3rdparty/speex-build/CMakeLists.txt
index 9bad21e0e..90d2c68cc 100644
--- a/3rdparty/speex-build/CMakeLists.txt
+++ b/3rdparty/speex-build/CMakeLists.txt
@@ -25,6 +25,9 @@ else()
add_library(speex STATIC)
endif()
+# Speex doesn't use include guards in its headers, so unity builds will fail
+set_target_properties(speex PROPERTIES UNITY_BUILD FALSE)
+
target_compile_definitions(speex PRIVATE "HAVE_CONFIG_H")
target_include_directories(speex PRIVATE SYSTEM "${SPEEX_DIR}/libspeex" "${SPEEXDSP_DIR}/libspeexdsp")