Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove support for CMake prior to v3.11.0 #2484

Merged
merged 1 commit into from
Nov 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 6 additions & 18 deletions Library/TeamTalkLib/build/ace/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
177 changes: 45 additions & 132 deletions Library/TeamTalkLib/build/ffmpeg/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down Expand Up @@ -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()
34 changes: 10 additions & 24 deletions Library/TeamTalkLib/build/libvpx/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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()
24 changes: 6 additions & 18 deletions Library/TeamTalkLib/build/ogg/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down Expand Up @@ -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()
Loading
Loading