diff options
| -rw-r--r-- | 3rdparty/celt-0.7.0-build/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | 3rdparty/mach-override-build/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | 3rdparty/speex-build/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | macx/osax/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | overlay/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/mumble/CMakeLists.txt | 3 |
6 files changed, 18 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") diff --git a/macx/osax/CMakeLists.txt b/macx/osax/CMakeLists.txt index f73dfe2d8..27f467010 100644 --- a/macx/osax/CMakeLists.txt +++ b/macx/osax/CMakeLists.txt @@ -11,6 +11,9 @@ add_library(MumbleOverlay MODULE "MumbleOverlay.sdef" ) +# The overlay doesn't work well with unity builds +set_target_properties(MumbleOverlay PROPERTIES UNITY_BUILD FALSE) + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/osax.plist.in" "${CMAKE_CURRENT_BINARY_DIR}/osax.plist") set_target_properties(MumbleOverlay diff --git a/overlay/CMakeLists.txt b/overlay/CMakeLists.txt index 733f7e450..0adc1a327 100644 --- a/overlay/CMakeLists.txt +++ b/overlay/CMakeLists.txt @@ -40,6 +40,9 @@ remove_definitions("-DUNICODE") add_library(overlay SHARED) +# The overlay doesn't work well with unity builds +set_target_properties(overlay PROPERTIES UNITY_BUILD FALSE) + find_program(FXC "fxc" DOC "Effect-Compiler tool") if(NOT FXC) message(FATAL_ERROR "Effect-Compiler tool not found!") diff --git a/src/mumble/CMakeLists.txt b/src/mumble/CMakeLists.txt index ced962c4b..949dc6154 100644 --- a/src/mumble/CMakeLists.txt +++ b/src/mumble/CMakeLists.txt @@ -521,6 +521,9 @@ if(bundled-opus) # Disable all warnings that the Opus code may emit disable_warnings_for_all_targets_in("${3RDPARTY_DIR}/opus") + # Opus doesn't work in unity builds + set_target_properties(opus PROPERTIES UNITY_BUILD FALSE) + add_dependencies(mumble opus) target_include_directories(mumble PRIVATE "${3RDPARTY_DIR}/opus/include") |