From 42e6a470288f932bee4fc375eed91482e99120f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Damstedt=20Rasmussen?= <contact@bearware.dk>
Date: Wed, 13 Nov 2024 21:13:51 +0100
Subject: [PATCH] Remove support for CMake prior to v3.11.0

---
 Library/TeamTalkLib/build/ace/CMakeLists.txt  |  24 +--
 .../TeamTalkLib/build/ffmpeg/CMakeLists.txt   | 177 +++++-------------
 .../TeamTalkLib/build/libvpx/CMakeLists.txt   |  34 +---
 Library/TeamTalkLib/build/ogg/CMakeLists.txt  |  24 +--
 .../TeamTalkLib/build/openssl/CMakeLists.txt  |  64 ++-----
 Library/TeamTalkLib/build/opus/CMakeLists.txt |  24 +--
 .../build/portaudio/CMakeLists.txt            |  15 +-
 .../TeamTalkLib/build/speex/CMakeLists.txt    |  24 +--
 .../TeamTalkLib/build/speexdsp/CMakeLists.txt |  24 +--
 .../TeamTalkLib/build/tinyxml/CMakeLists.txt  |  12 +-
 .../TeamTalkLib/build/webrtc/CMakeLists.txt   |  19 +-
 Library/TeamTalkLib/build/zlib/CMakeLists.txt |  12 +-
 12 files changed, 117 insertions(+), 336 deletions(-)

diff --git a/Library/TeamTalkLib/build/ace/CMakeLists.txt b/Library/TeamTalkLib/build/ace/CMakeLists.txt
index d8e4015b2c..cf0c7c6b26 100644
--- a/Library/TeamTalkLib/build/ace/CMakeLists.txt
+++ b/Library/TeamTalkLib/build/ace/CMakeLists.txt
@@ -385,15 +385,9 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   if (TOOLCHAIN_BUILD_EXTERNALPROJECTS)
     add_dependencies(ace ACE-src)
   endif()
-  if (${CMAKE_VERSION} VERSION_LESS "3.11.0")
-    set_target_properties(ace PROPERTIES
-      INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libACE.a)
-  else()
-    target_include_directories (ace INTERFACE ${INSTALL_DIR}/include)
-    set_target_properties(ace PROPERTIES
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libACE.a)
-  endif()
+  target_include_directories (ace INTERFACE ${INSTALL_DIR}/include)
+  set_target_properties(ace PROPERTIES
+    IMPORTED_LOCATION ${INSTALL_DIR}/lib/libACE.a)
 
   add_library(ace_ssl STATIC IMPORTED GLOBAL)
   set_target_properties(ace_ssl PROPERTIES
@@ -494,15 +488,9 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Android")
   if (TOOLCHAIN_BUILD_EXTERNALPROJECTS)
     add_dependencies(ace ACE-src)
   endif()
-  if (${CMAKE_VERSION} VERSION_LESS "3.11.0")
-    set_target_properties(ace PROPERTIES
-      INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libACE.a)
-  else()
-    target_include_directories (ace INTERFACE ${INSTALL_DIR}/include)
-    set_target_properties(ace PROPERTIES
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libACE.a)
-  endif()
+  target_include_directories (ace INTERFACE ${INSTALL_DIR}/include)
+  set_target_properties(ace PROPERTIES
+    IMPORTED_LOCATION ${INSTALL_DIR}/lib/libACE.a)
 
   add_library(ace_ssl STATIC IMPORTED GLOBAL)
   set_target_properties(ace_ssl PROPERTIES
diff --git a/Library/TeamTalkLib/build/ffmpeg/CMakeLists.txt b/Library/TeamTalkLib/build/ffmpeg/CMakeLists.txt
index 470e7132bf..11e3557bd1 100644
--- a/Library/TeamTalkLib/build/ffmpeg/CMakeLists.txt
+++ b/Library/TeamTalkLib/build/ffmpeg/CMakeLists.txt
@@ -402,104 +402,60 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   if (TOOLCHAIN_BUILD_EXTERNALPROJECTS)
     add_dependencies(ffmpeg-avdevice ffmpeg-src)
   endif()
-  if (${CMAKE_VERSION} VERSION_LESS "3.11.0")
-    set_target_properties(ffmpeg-avdevice PROPERTIES
-      INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include
-      INTERFACE_COMPILE_OPTIONS -D__STDC_CONSTANT_MACROS
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libavdevice.a)
-    target_link_libraries(ffmpeg-avdevice INTERFACE "${FFMPEG_LINK}")
-  else()
-    target_include_directories (ffmpeg-avdevice INTERFACE ${INSTALL_DIR}/include)
-    set_target_properties(ffmpeg-avdevice PROPERTIES
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libavdevice.a)
-    target_compile_options(ffmpeg-avdevice INTERFACE -D__STDC_CONSTANT_MACROS)
-    target_link_libraries(ffmpeg-avdevice INTERFACE "${FFMPEG_LINK}")
-  endif()
+  target_include_directories (ffmpeg-avdevice INTERFACE ${INSTALL_DIR}/include)
+  set_target_properties(ffmpeg-avdevice PROPERTIES
+    IMPORTED_LOCATION ${INSTALL_DIR}/lib/libavdevice.a)
+  target_compile_options(ffmpeg-avdevice INTERFACE -D__STDC_CONSTANT_MACROS)
+  target_link_libraries(ffmpeg-avdevice INTERFACE "${FFMPEG_LINK}")
 
   add_library(ffmpeg-avfilter STATIC IMPORTED GLOBAL)
   if (TOOLCHAIN_BUILD_EXTERNALPROJECTS)
     add_dependencies(ffmpeg-avfilter ffmpeg-src)
   endif()
-  if (${CMAKE_VERSION} VERSION_LESS "3.11.0")
-    set_target_properties(ffmpeg-avfilter PROPERTIES
-      INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libavfilter.a)
-  else()
-    target_include_directories (ffmpeg-avfilter INTERFACE ${INSTALL_DIR}/include)
-    set_target_properties(ffmpeg-avfilter PROPERTIES
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libavfilter.a)
-  endif()
+  target_include_directories (ffmpeg-avfilter INTERFACE ${INSTALL_DIR}/include)
+  set_target_properties(ffmpeg-avfilter PROPERTIES
+    IMPORTED_LOCATION ${INSTALL_DIR}/lib/libavfilter.a)
 
   add_library(ffmpeg-avformat STATIC IMPORTED GLOBAL)
   if (TOOLCHAIN_BUILD_EXTERNALPROJECTS)
     add_dependencies(ffmpeg-avformat ffmpeg-src)
   endif()
-  if (${CMAKE_VERSION} VERSION_LESS "3.11.0")
-    set_target_properties(ffmpeg-avformat PROPERTIES
-      INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libavformat.a)
-  else()
-    target_include_directories (ffmpeg-avformat INTERFACE ${INSTALL_DIR}/include)
-    set_target_properties(ffmpeg-avformat PROPERTIES
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libavformat.a)
-  endif()
+  target_include_directories (ffmpeg-avformat INTERFACE ${INSTALL_DIR}/include)
+  set_target_properties(ffmpeg-avformat PROPERTIES
+    IMPORTED_LOCATION ${INSTALL_DIR}/lib/libavformat.a)
   target_link_libraries(ffmpeg-avformat INTERFACE ssl crypto)
 
   add_library(ffmpeg-avcodec STATIC IMPORTED GLOBAL)
   if (TOOLCHAIN_BUILD_EXTERNALPROJECTS)
     add_dependencies(ffmpeg-avcodec ffmpeg-src)
   endif()
-  if (${CMAKE_VERSION} VERSION_LESS "3.11.0")
-    set_target_properties(ffmpeg-avcodec PROPERTIES
-      INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libavcodec.a)
-  else()
-    target_include_directories (ffmpeg-avcodec INTERFACE ${INSTALL_DIR}/include)
-    set_target_properties(ffmpeg-avcodec PROPERTIES
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libavcodec.a)
-  endif()
+  target_include_directories (ffmpeg-avcodec INTERFACE ${INSTALL_DIR}/include)
+  set_target_properties(ffmpeg-avcodec PROPERTIES
+    IMPORTED_LOCATION ${INSTALL_DIR}/lib/libavcodec.a)
 
   add_library(ffmpeg-swresample STATIC IMPORTED GLOBAL)
   if (TOOLCHAIN_BUILD_EXTERNALPROJECTS)
     add_dependencies(ffmpeg-swresample ffmpeg-src)
   endif()
-  if (${CMAKE_VERSION} VERSION_LESS "3.11.0")
-    set_target_properties(ffmpeg-swresample PROPERTIES
-      INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libswresample.a)
-  else()
-    target_include_directories (ffmpeg-swresample INTERFACE ${INSTALL_DIR}/include)
-    set_target_properties(ffmpeg-swresample PROPERTIES
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libswresample.a)
-  endif()
+  target_include_directories (ffmpeg-swresample INTERFACE ${INSTALL_DIR}/include)
+  set_target_properties(ffmpeg-swresample PROPERTIES
+    IMPORTED_LOCATION ${INSTALL_DIR}/lib/libswresample.a)
 
   add_library(ffmpeg-swscale STATIC IMPORTED GLOBAL)
   if (TOOLCHAIN_BUILD_EXTERNALPROJECTS)
     add_dependencies(ffmpeg-swscale ffmpeg-src)
   endif()
-  if (${CMAKE_VERSION} VERSION_LESS "3.11.0")
-    set_target_properties(ffmpeg-swscale PROPERTIES
-      INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libswscale.a)
-  else()
-    target_include_directories (ffmpeg-swscale INTERFACE ${INSTALL_DIR}/include)
-    set_target_properties(ffmpeg-swscale PROPERTIES
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libswscale.a)
-  endif()
+  target_include_directories (ffmpeg-swscale INTERFACE ${INSTALL_DIR}/include)
+  set_target_properties(ffmpeg-swscale PROPERTIES
+    IMPORTED_LOCATION ${INSTALL_DIR}/lib/libswscale.a)
 
   add_library(ffmpeg-avutil STATIC IMPORTED GLOBAL)
   if (TOOLCHAIN_BUILD_EXTERNALPROJECTS)
     add_dependencies(ffmpeg-avutil ffmpeg-src)
   endif()
-  if (${CMAKE_VERSION} VERSION_LESS "3.11.0")
-    set_target_properties(ffmpeg-avutil PROPERTIES
-      INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libavutil.a)
-  else()
-    target_include_directories (ffmpeg-avutil INTERFACE ${INSTALL_DIR}/include)
-    set_target_properties(ffmpeg-avutil PROPERTIES
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libavutil.a)
-  endif()
+  target_include_directories (ffmpeg-avutil INTERFACE ${INSTALL_DIR}/include)
+  set_target_properties(ffmpeg-avutil PROPERTIES
+    IMPORTED_LOCATION ${INSTALL_DIR}/lib/libavutil.a)
 
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "Android")
 
@@ -555,101 +511,58 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Android")
   if (TOOLCHAIN_BUILD_EXTERNALPROJECTS)
     add_dependencies(ffmpeg-avdevice ffmpeg-src)
   endif()
-  if (${CMAKE_VERSION} VERSION_LESS "3.11.0")
-    set_target_properties(ffmpeg-avdevice PROPERTIES
-      INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include
-      INTERFACE_COMPILE_OPTIONS -D__STDC_CONSTANT_MACROS
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libavdevice.a)
-  else()
-    target_include_directories (ffmpeg-avdevice INTERFACE ${INSTALL_DIR}/include)
-    set_target_properties(ffmpeg-avdevice PROPERTIES
-      INTERFACE_COMPILE_OPTIONS -D__STDC_CONSTANT_MACROS
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libavdevice.a)
-  endif()
+  target_include_directories (ffmpeg-avdevice INTERFACE ${INSTALL_DIR}/include)
+  set_target_properties(ffmpeg-avdevice PROPERTIES
+    INTERFACE_COMPILE_OPTIONS -D__STDC_CONSTANT_MACROS
+    IMPORTED_LOCATION ${INSTALL_DIR}/lib/libavdevice.a)
 
   add_library(ffmpeg-avfilter STATIC IMPORTED GLOBAL)
   if (TOOLCHAIN_BUILD_EXTERNALPROJECTS)
     add_dependencies(ffmpeg-avfilter ffmpeg-src)
   endif()
-  if (${CMAKE_VERSION} VERSION_LESS "3.11.0")
-    set_target_properties(ffmpeg-avfilter PROPERTIES
-      INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libavfilter.a)
-  else()
-    target_include_directories (ffmpeg-avfilter INTERFACE ${INSTALL_DIR}/include)
-    set_target_properties(ffmpeg-avfilter PROPERTIES
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libavfilter.a)
-  endif()
+  target_include_directories (ffmpeg-avfilter INTERFACE ${INSTALL_DIR}/include)
+  set_target_properties(ffmpeg-avfilter PROPERTIES
+    IMPORTED_LOCATION ${INSTALL_DIR}/lib/libavfilter.a)
 
   add_library(ffmpeg-avformat STATIC IMPORTED GLOBAL)
   if (TOOLCHAIN_BUILD_EXTERNALPROJECTS)
     add_dependencies(ffmpeg-avformat ffmpeg-src)
   endif()
-  if (${CMAKE_VERSION} VERSION_LESS "3.11.0")
-    set_target_properties(ffmpeg-avformat PROPERTIES
-      INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libavformat.a)
-  else()
-    target_include_directories (ffmpeg-avformat INTERFACE ${INSTALL_DIR}/include)
-    set_target_properties(ffmpeg-avformat PROPERTIES
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libavformat.a)
-  endif()
+  target_include_directories (ffmpeg-avformat INTERFACE ${INSTALL_DIR}/include)
+  set_target_properties(ffmpeg-avformat PROPERTIES
+    IMPORTED_LOCATION ${INSTALL_DIR}/lib/libavformat.a)
   target_link_libraries(ffmpeg-avformat INTERFACE openssl-crypto openssl-ssl)
 
   add_library(ffmpeg-avcodec STATIC IMPORTED GLOBAL)
   if (TOOLCHAIN_BUILD_EXTERNALPROJECTS)
     add_dependencies(ffmpeg-avcodec ffmpeg-src)
   endif()
-  if (${CMAKE_VERSION} VERSION_LESS "3.11.0")
-    set_target_properties(ffmpeg-avcodec PROPERTIES
-      INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libavcodec.a)
-  else()
-    target_include_directories (ffmpeg-avcodec INTERFACE ${INSTALL_DIR}/include)
-    set_target_properties(ffmpeg-avcodec PROPERTIES
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libavcodec.a)
-  endif()
+  target_include_directories (ffmpeg-avcodec INTERFACE ${INSTALL_DIR}/include)
+  set_target_properties(ffmpeg-avcodec PROPERTIES
+    IMPORTED_LOCATION ${INSTALL_DIR}/lib/libavcodec.a)
 
   add_library(ffmpeg-swresample STATIC IMPORTED GLOBAL)
   if (TOOLCHAIN_BUILD_EXTERNALPROJECTS)
     add_dependencies(ffmpeg-swresample ffmpeg-src)
   endif()
-  if (${CMAKE_VERSION} VERSION_LESS "3.11.0")
-    set_target_properties(ffmpeg-swresample PROPERTIES
-      INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libswresample.a)
-  else()
-    target_include_directories (ffmpeg-swresample INTERFACE ${INSTALL_DIR}/include)
-    set_target_properties(ffmpeg-swresample PROPERTIES
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libswresample.a)
-  endif()
+  target_include_directories (ffmpeg-swresample INTERFACE ${INSTALL_DIR}/include)
+  set_target_properties(ffmpeg-swresample PROPERTIES
+    IMPORTED_LOCATION ${INSTALL_DIR}/lib/libswresample.a)
 
   add_library(ffmpeg-swscale STATIC IMPORTED GLOBAL)
   if (TOOLCHAIN_BUILD_EXTERNALPROJECTS)
     add_dependencies(ffmpeg-swscale ffmpeg-src)
   endif()
-  if (${CMAKE_VERSION} VERSION_LESS "3.11.0")
-    set_target_properties(ffmpeg-swscale PROPERTIES
-      INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libswscale.a)
-  else()
-    target_include_directories (ffmpeg-swscale INTERFACE ${INSTALL_DIR}/include)
-    set_target_properties(ffmpeg-swscale PROPERTIES
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libswscale.a)
-  endif()
+  target_include_directories (ffmpeg-swscale INTERFACE ${INSTALL_DIR}/include)
+  set_target_properties(ffmpeg-swscale PROPERTIES
+    IMPORTED_LOCATION ${INSTALL_DIR}/lib/libswscale.a)
 
   add_library(ffmpeg-avutil STATIC IMPORTED GLOBAL)
   if (TOOLCHAIN_BUILD_EXTERNALPROJECTS)
     add_dependencies(ffmpeg-avutil ffmpeg-src)
   endif()
-  if (${CMAKE_VERSION} VERSION_LESS "3.11.0")
-    set_target_properties(ffmpeg-avutil PROPERTIES
-      INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libavutil.a)
-  else()
-    target_include_directories (ffmpeg-avutil INTERFACE ${INSTALL_DIR}/include)
-    set_target_properties(ffmpeg-avutil PROPERTIES
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libavutil.a)
-  endif()
+  target_include_directories (ffmpeg-avutil INTERFACE ${INSTALL_DIR}/include)
+  set_target_properties(ffmpeg-avutil PROPERTIES
+    IMPORTED_LOCATION ${INSTALL_DIR}/lib/libavutil.a)
 
 endif()
diff --git a/Library/TeamTalkLib/build/libvpx/CMakeLists.txt b/Library/TeamTalkLib/build/libvpx/CMakeLists.txt
index 1c6aa20360..2ef99e1659 100644
--- a/Library/TeamTalkLib/build/libvpx/CMakeLists.txt
+++ b/Library/TeamTalkLib/build/libvpx/CMakeLists.txt
@@ -247,18 +247,11 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   if (TOOLCHAIN_BUILD_EXTERNALPROJECTS)
     add_dependencies(libvpx libvpx-src)
   endif()
-  if (${CMAKE_VERSION} VERSION_LESS "3.11.0")
-    set_target_properties(libvpx PROPERTIES
-      INTERFACE_LINK_OPTIONS "-Wl,-Bsymbolic"
-      INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libvpx.a)
-  else()
-    target_include_directories (libvpx INTERFACE ${INSTALL_DIR}/include)
-    set_target_properties(libvpx PROPERTIES
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libvpx.a)
-    if (${CMAKE_SYSTEM_NAME} MATCHES "Linux" AND ${CMAKE_SIZEOF_VOID_P} EQUAL 8)
-      target_link_options(libvpx INTERFACE "-Wl,-Bsymbolic")
-    endif()
+  target_include_directories (libvpx INTERFACE ${INSTALL_DIR}/include)
+  set_target_properties(libvpx PROPERTIES
+    IMPORTED_LOCATION ${INSTALL_DIR}/lib/libvpx.a)
+  if (${CMAKE_SYSTEM_NAME} MATCHES "Linux" AND ${CMAKE_SIZEOF_VOID_P} EQUAL 8)
+    target_link_options(libvpx INTERFACE "-Wl,-Bsymbolic")
   endif()
 
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "Android")
@@ -314,18 +307,11 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Android")
   if (TOOLCHAIN_BUILD_EXTERNALPROJECTS)
     add_dependencies(libvpx libvpx-src)
   endif()
-  if (${CMAKE_VERSION} VERSION_LESS "3.11.0")
-    set_target_properties(libvpx PROPERTIES
-      INTERFACE_LINK_OPTIONS "-Wl,-Bsymbolic"
-      INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libvpx.a)
-  else()
-    target_include_directories (libvpx INTERFACE ${INSTALL_DIR}/include)
-    set_target_properties(libvpx PROPERTIES
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libvpx.a)
-    if (${CMAKE_SYSTEM_NAME} MATCHES "Linux" AND ${CMAKE_SIZEOF_VOID_P} EQUAL 8)
-      target_link_options(libvpx INTERFACE "-Wl,-Bsymbolic")
-    endif()
+  target_include_directories (libvpx INTERFACE ${INSTALL_DIR}/include)
+  set_target_properties(libvpx PROPERTIES
+    IMPORTED_LOCATION ${INSTALL_DIR}/lib/libvpx.a)
+  if (${CMAKE_SYSTEM_NAME} MATCHES "Linux" AND ${CMAKE_SIZEOF_VOID_P} EQUAL 8)
+    target_link_options(libvpx INTERFACE "-Wl,-Bsymbolic")
   endif()
 
 endif()
diff --git a/Library/TeamTalkLib/build/ogg/CMakeLists.txt b/Library/TeamTalkLib/build/ogg/CMakeLists.txt
index c4832bab99..3263286137 100644
--- a/Library/TeamTalkLib/build/ogg/CMakeLists.txt
+++ b/Library/TeamTalkLib/build/ogg/CMakeLists.txt
@@ -129,15 +129,9 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   if (TOOLCHAIN_BUILD_EXTERNALPROJECTS)
     add_dependencies(ogg ogg-src)
   endif()
-  if (${CMAKE_VERSION} VERSION_LESS "3.11.0")
-    set_target_properties(ogg PROPERTIES
-      INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libogg.a)
-  else()
-    target_include_directories (ogg INTERFACE ${INSTALL_DIR}/include)
-    set_target_properties(ogg PROPERTIES
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libogg.a)
-  endif()
+  target_include_directories (ogg INTERFACE ${INSTALL_DIR}/include)
+  set_target_properties(ogg PROPERTIES
+    IMPORTED_LOCATION ${INSTALL_DIR}/lib/libogg.a)
 
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "Android")
 
@@ -167,14 +161,8 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Android")
   if (TOOLCHAIN_BUILD_EXTERNALPROJECTS)
     add_dependencies(ogg ogg-src)
   endif()
-  if (${CMAKE_VERSION} VERSION_LESS "3.11.0")
-    set_target_properties(ogg PROPERTIES
-      INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libogg.a)
-  else()
-    target_include_directories (ogg INTERFACE ${INSTALL_DIR}/include)
-    set_target_properties(ogg PROPERTIES
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libogg.a)
-  endif()
+  target_include_directories (ogg INTERFACE ${INSTALL_DIR}/include)
+  set_target_properties(ogg PROPERTIES
+    IMPORTED_LOCATION ${INSTALL_DIR}/lib/libogg.a)
 
 endif()
diff --git a/Library/TeamTalkLib/build/openssl/CMakeLists.txt b/Library/TeamTalkLib/build/openssl/CMakeLists.txt
index 95444d35ef..2ed6142d6a 100644
--- a/Library/TeamTalkLib/build/openssl/CMakeLists.txt
+++ b/Library/TeamTalkLib/build/openssl/CMakeLists.txt
@@ -220,35 +220,19 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   if (TOOLCHAIN_BUILD_EXTERNALPROJECTS)
     add_dependencies(openssl-crypto openssl-src)
   endif()
-  if (${CMAKE_VERSION} VERSION_LESS "3.11.0")
-    set_target_properties(openssl-crypto PROPERTIES
-      INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include
-      INTERFACE_COMPILE_OPTIONS -pthread
-      INTERFACE_LINK_OPTIONS -pthread
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libcrypto.a)
-  else()
-    target_include_directories (openssl-crypto INTERFACE ${INSTALL_DIR}/include)
-    set_target_properties(openssl-crypto PROPERTIES
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libcrypto.a)
-  endif()
+  target_include_directories (openssl-crypto INTERFACE ${INSTALL_DIR}/include)
+  set_target_properties(openssl-crypto PROPERTIES
+    IMPORTED_LOCATION ${INSTALL_DIR}/lib/libcrypto.a)
 
   add_library(openssl-ssl STATIC IMPORTED GLOBAL)
   if (TOOLCHAIN_BUILD_EXTERNALPROJECTS)
     add_dependencies(openssl-ssl openssl-src)
   endif()
-  if (${CMAKE_VERSION} VERSION_LESS "3.11.0")
-    set_target_properties(openssl-ssl PROPERTIES
-      INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include
-      INTERFACE_COMPILE_OPTIONS -pthread
-      INTERFACE_LINK_OPTIONS -pthread
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libssl.a)
-  else()
-    target_include_directories (openssl-ssl INTERFACE ${INSTALL_DIR}/include)
-    set_target_properties(openssl-ssl PROPERTIES
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libssl.a)
-    target_compile_options (openssl-ssl INTERFACE -pthread)
-    target_link_options(openssl-ssl INTERFACE -pthread)
-  endif()
+  target_include_directories (openssl-ssl INTERFACE ${INSTALL_DIR}/include)
+  set_target_properties(openssl-ssl PROPERTIES
+    IMPORTED_LOCATION ${INSTALL_DIR}/lib/libssl.a)
+  target_compile_options (openssl-ssl INTERFACE -pthread)
+  target_link_options(openssl-ssl INTERFACE -pthread)
 
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "Android")
 
@@ -293,34 +277,18 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Android")
   if (TOOLCHAIN_BUILD_EXTERNALPROJECTS)
     add_dependencies(openssl-crypto openssl-src)
   endif()
-  if (${CMAKE_VERSION} VERSION_LESS "3.11.0")
-    set_target_properties(openssl-crypto PROPERTIES
-      INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include
-      INTERFACE_COMPILE_OPTIONS -pthread
-      INTERFACE_LINK_OPTIONS -pthread
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libcrypto.a)
-  else()
-    target_include_directories (openssl-crypto INTERFACE ${INSTALL_DIR}/include)
-    set_target_properties(openssl-crypto PROPERTIES
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libcrypto.a)
-  endif()
+  target_include_directories (openssl-crypto INTERFACE ${INSTALL_DIR}/include)
+  set_target_properties(openssl-crypto PROPERTIES
+    IMPORTED_LOCATION ${INSTALL_DIR}/lib/libcrypto.a)
 
   add_library(openssl-ssl STATIC IMPORTED GLOBAL)
   if (TOOLCHAIN_BUILD_EXTERNALPROJECTS)
     add_dependencies(openssl-ssl openssl-src)
   endif()
-  if (${CMAKE_VERSION} VERSION_LESS "3.11.0")
-    set_target_properties(openssl-ssl PROPERTIES
-      INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include
-      INTERFACE_COMPILE_OPTIONS -pthread
-      INTERFACE_LINK_OPTIONS -pthread
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libssl.a)
-  else()
-    target_include_directories (openssl-ssl INTERFACE ${INSTALL_DIR}/include)
-    set_target_properties(openssl-ssl PROPERTIES
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libssl.a)
-    target_compile_options (openssl-ssl INTERFACE -pthread)
-    target_link_options(openssl-ssl INTERFACE -pthread)
-  endif()
+  target_include_directories (openssl-ssl INTERFACE ${INSTALL_DIR}/include)
+  set_target_properties(openssl-ssl PROPERTIES
+    IMPORTED_LOCATION ${INSTALL_DIR}/lib/libssl.a)
+  target_compile_options (openssl-ssl INTERFACE -pthread)
+  target_link_options(openssl-ssl INTERFACE -pthread)
 
 endif()
diff --git a/Library/TeamTalkLib/build/opus/CMakeLists.txt b/Library/TeamTalkLib/build/opus/CMakeLists.txt
index 91b33185f7..02a1a45dbb 100644
--- a/Library/TeamTalkLib/build/opus/CMakeLists.txt
+++ b/Library/TeamTalkLib/build/opus/CMakeLists.txt
@@ -138,15 +138,9 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   if (TOOLCHAIN_BUILD_EXTERNALPROJECTS)
     add_dependencies(opus opus-src)
   endif()
-  if (${CMAKE_VERSION} VERSION_LESS "3.11.0")
-    set_target_properties(opus PROPERTIES
-      INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libopus.a)
-  else()
-    target_include_directories (opus INTERFACE ${INSTALL_DIR}/include)
-    set_target_properties(opus PROPERTIES
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libopus.a)
-  endif()
+  target_include_directories (opus INTERFACE ${INSTALL_DIR}/include)
+  set_target_properties(opus PROPERTIES
+    IMPORTED_LOCATION ${INSTALL_DIR}/lib/libopus.a)
 
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "Android")
 
@@ -184,13 +178,7 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Android")
   if (TOOLCHAIN_BUILD_EXTERNALPROJECTS)
     add_dependencies(opus opus-src)
   endif()
-  if (${CMAKE_VERSION} VERSION_LESS "3.11.0")
-    set_target_properties(opus PROPERTIES
-      INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libopus.a)
-  else()
-    target_include_directories (opus INTERFACE ${INSTALL_DIR}/include)
-    set_target_properties(opus PROPERTIES
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libopus.a)
-  endif()
+  target_include_directories (opus INTERFACE ${INSTALL_DIR}/include)
+  set_target_properties(opus PROPERTIES
+    IMPORTED_LOCATION ${INSTALL_DIR}/lib/libopus.a)
 endif()
diff --git a/Library/TeamTalkLib/build/portaudio/CMakeLists.txt b/Library/TeamTalkLib/build/portaudio/CMakeLists.txt
index fccac29505..5e84dfa182 100644
--- a/Library/TeamTalkLib/build/portaudio/CMakeLists.txt
+++ b/Library/TeamTalkLib/build/portaudio/CMakeLists.txt
@@ -110,16 +110,9 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   # Ubuntu: libpulse-dev
   find_library(PULSE_LIBRARY pulse)
 
-  if (${CMAKE_VERSION} VERSION_LESS "3.11.0")
-    set_target_properties(portaudio PROPERTIES
-      INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libportaudio.a)
-    target_link_libraries(portaudio INTERFACE ${ASOUND_LIBRARY} ${PULSE_LIBRARY})
-  else()
-    target_include_directories (portaudio INTERFACE ${INSTALL_DIR}/include)
-    set_target_properties(portaudio PROPERTIES
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libportaudio.a)
-    target_link_libraries(portaudio INTERFACE ${ASOUND_LIBRARY} ${PULSE_LIBRARY})
-  endif()
+  target_include_directories (portaudio INTERFACE ${INSTALL_DIR}/include)
+  set_target_properties(portaudio PROPERTIES
+    IMPORTED_LOCATION ${INSTALL_DIR}/lib/libportaudio.a)
+  target_link_libraries(portaudio INTERFACE ${ASOUND_LIBRARY} ${PULSE_LIBRARY})
 
 endif()
diff --git a/Library/TeamTalkLib/build/speex/CMakeLists.txt b/Library/TeamTalkLib/build/speex/CMakeLists.txt
index c566241c4d..3834d2c948 100644
--- a/Library/TeamTalkLib/build/speex/CMakeLists.txt
+++ b/Library/TeamTalkLib/build/speex/CMakeLists.txt
@@ -171,15 +171,9 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   if (TOOLCHAIN_BUILD_EXTERNALPROJECTS)
     add_dependencies(speex speex-src)
   endif()
-  if (${CMAKE_VERSION} VERSION_LESS "3.11.0")
-    set_target_properties(speex PROPERTIES
-      INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libspeex.a)
-  else()
-    target_include_directories (speex INTERFACE ${INSTALL_DIR}/include)
-    set_target_properties(speex PROPERTIES
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libspeex.a)
-  endif()
+  target_include_directories (speex INTERFACE ${INSTALL_DIR}/include)
+  set_target_properties(speex PROPERTIES
+    IMPORTED_LOCATION ${INSTALL_DIR}/lib/libspeex.a)
 
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "Android")
 
@@ -226,14 +220,8 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Android")
   if (TOOLCHAIN_BUILD_EXTERNALPROJECTS)
     add_dependencies(speex speex-src)
   endif()
-  if (${CMAKE_VERSION} VERSION_LESS "3.11.0")
-    set_target_properties(speex PROPERTIES
-      INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libspeex.a)
-  else()
-    target_include_directories (speex INTERFACE ${INSTALL_DIR}/include)
-    set_target_properties(speex PROPERTIES
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libspeex.a)
-  endif()
+  target_include_directories (speex INTERFACE ${INSTALL_DIR}/include)
+  set_target_properties(speex PROPERTIES
+    IMPORTED_LOCATION ${INSTALL_DIR}/lib/libspeex.a)
 
 endif()
diff --git a/Library/TeamTalkLib/build/speexdsp/CMakeLists.txt b/Library/TeamTalkLib/build/speexdsp/CMakeLists.txt
index 89871f8848..b9e579e7cc 100644
--- a/Library/TeamTalkLib/build/speexdsp/CMakeLists.txt
+++ b/Library/TeamTalkLib/build/speexdsp/CMakeLists.txt
@@ -172,15 +172,9 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   if (TOOLCHAIN_BUILD_EXTERNALPROJECTS)
     add_dependencies(speexdsp speexdsp-src)
   endif()
-  if (${CMAKE_VERSION} VERSION_LESS "3.11.0")
-    set_target_properties(speexdsp PROPERTIES
-      INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libspeexdsp.a)
-  else()
-    target_include_directories (speexdsp INTERFACE ${INSTALL_DIR}/include)
-    set_target_properties(speexdsp PROPERTIES
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libspeexdsp.a)
-  endif()
+  target_include_directories (speexdsp INTERFACE ${INSTALL_DIR}/include)
+  set_target_properties(speexdsp PROPERTIES
+    IMPORTED_LOCATION ${INSTALL_DIR}/lib/libspeexdsp.a)
 
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "Android")
 
@@ -235,14 +229,8 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Android")
   if (TOOLCHAIN_BUILD_EXTERNALPROJECTS)
     add_dependencies(speexdsp speexdsp-src)
   endif()
-  if (${CMAKE_VERSION} VERSION_LESS "3.11.0")
-    set_target_properties(speexdsp PROPERTIES
-      INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libspeexdsp.a)
-  else()
-    target_include_directories (speexdsp INTERFACE ${INSTALL_DIR}/include)
-    set_target_properties(speexdsp PROPERTIES
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libspeexdsp.a)
-  endif()
+  target_include_directories (speexdsp INTERFACE ${INSTALL_DIR}/include)
+  set_target_properties(speexdsp PROPERTIES
+    IMPORTED_LOCATION ${INSTALL_DIR}/lib/libspeexdsp.a)
 
 endif()
diff --git a/Library/TeamTalkLib/build/tinyxml/CMakeLists.txt b/Library/TeamTalkLib/build/tinyxml/CMakeLists.txt
index 0c1f8a9053..4f616196d7 100644
--- a/Library/TeamTalkLib/build/tinyxml/CMakeLists.txt
+++ b/Library/TeamTalkLib/build/tinyxml/CMakeLists.txt
@@ -96,15 +96,9 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
       add_dependencies(tinyxml tinyxml-src)
     endif()
 
-    if (${CMAKE_VERSION} VERSION_LESS "3.11.0")
-      set_target_properties(tinyxml PROPERTIES
-        INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include
-        IMPORTED_LOCATION ${INSTALL_DIR}/lib/libtinyxml.a)
-    else()
-      target_include_directories (tinyxml INTERFACE ${INSTALL_DIR}/include)
-      set_target_properties(tinyxml PROPERTIES
-        IMPORTED_LOCATION ${INSTALL_DIR}/lib/libtinyxml.a)
-    endif()
+    target_include_directories (tinyxml INTERFACE ${INSTALL_DIR}/include)
+    set_target_properties(tinyxml PROPERTIES
+      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libtinyxml.a)
 
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "Android")
 
diff --git a/Library/TeamTalkLib/build/webrtc/CMakeLists.txt b/Library/TeamTalkLib/build/webrtc/CMakeLists.txt
index 3f65d3c4fb..dba8c9d6dc 100644
--- a/Library/TeamTalkLib/build/webrtc/CMakeLists.txt
+++ b/Library/TeamTalkLib/build/webrtc/CMakeLists.txt
@@ -344,19 +344,12 @@ else()
     add_dependencies(webrtc webrtc-src)
   endif()
 
-  if (${CMAKE_VERSION} VERSION_LESS "3.11.0")
-    set (WEBRTC_INCLUDE_DIRS ${WEBRTC_INSTALL_ROOT}/include ${WEBRTC_INSTALL_ROOT}/include/modules/audio_processing/include ${WEBRTC_INSTALL_ROOT}/include/third_party/abseil-cpp)
-    set_target_properties(webrtc PROPERTIES
-      INTERFACE_INCLUDE_DIRECTORIES "${WEBRTC_INCLUDE_DIRS}"
-      IMPORTED_LOCATION ${WEBRTC_INSTALL_ROOT}/obj/modules/audio_processing/libteamtalk.a)
-  else()
-    target_include_directories (webrtc INTERFACE
-      ${WEBRTC_INSTALL_ROOT}/include
-      ${WEBRTC_INSTALL_ROOT}/include/modules/audio_processing/include
-      ${WEBRTC_INSTALL_ROOT}/include/third_party/abseil-cpp)
-    set_target_properties(webrtc PROPERTIES
-      IMPORTED_LOCATION ${WEBRTC_INSTALL_ROOT}/obj/modules/audio_processing/libteamtalk.a)
-  endif()
+  target_include_directories (webrtc INTERFACE
+    ${WEBRTC_INSTALL_ROOT}/include
+    ${WEBRTC_INSTALL_ROOT}/include/modules/audio_processing/include
+    ${WEBRTC_INSTALL_ROOT}/include/third_party/abseil-cpp)
+  set_target_properties(webrtc PROPERTIES
+    IMPORTED_LOCATION ${WEBRTC_INSTALL_ROOT}/obj/modules/audio_processing/libteamtalk.a)
 
   # $ find webrtc/obj/ -name *.a -exec nm -A -C {} \; | grep webrtc::rnn_vad::RnnBasedVad::RnnBasedVad
 endif()
diff --git a/Library/TeamTalkLib/build/zlib/CMakeLists.txt b/Library/TeamTalkLib/build/zlib/CMakeLists.txt
index 011245790d..794f9add9c 100644
--- a/Library/TeamTalkLib/build/zlib/CMakeLists.txt
+++ b/Library/TeamTalkLib/build/zlib/CMakeLists.txt
@@ -127,14 +127,8 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   if (TOOLCHAIN_BUILD_EXTERNALPROJECTS)
     add_dependencies(zlib zlib-src)
   endif()
-  if (${CMAKE_VERSION} VERSION_LESS "3.11.0")
-      set_target_properties(zlib PROPERTIES
-        INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include
-        IMPORTED_LOCATION ${INSTALL_DIR}/lib/libz.a)
-  else()
-    target_include_directories (zlib INTERFACE ${INSTALL_DIR}/include)
-    set_target_properties(zlib PROPERTIES
-      IMPORTED_LOCATION ${INSTALL_DIR}/lib/libz.a)
-  endif()
+  target_include_directories (zlib INTERFACE ${INSTALL_DIR}/include)
+  set_target_properties(zlib PROPERTIES
+    IMPORTED_LOCATION ${INSTALL_DIR}/lib/libz.a)
 
 endif()