From 0ae8bbaf5d85b065354dcc010d08a4a2e759f867 Mon Sep 17 00:00:00 2001 From: Roxie Linden Date: Wed, 6 Sep 2023 15:28:02 -0700 Subject: Checkpoint WebRTC Voice --- indra/cmake/CMakeLists.txt | 1 + indra/cmake/LLWebRTC.cmake | 1 + indra/cmake/WebRTC.cmake | 43 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+) create mode 100644 indra/cmake/LLWebRTC.cmake create mode 100644 indra/cmake/WebRTC.cmake (limited to 'indra/cmake') diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt index 1fd83eadff..8a77d0b882 100644 --- a/indra/cmake/CMakeLists.txt +++ b/indra/cmake/CMakeLists.txt @@ -63,6 +63,7 @@ set(cmake_SOURCE_FILES ViewerMiscLibs.cmake VisualLeakDetector.cmake LibVLCPlugin.cmake + WebRTC.cmake XmlRpcEpi.cmake xxHash.cmake ZLIBNG.cmake diff --git a/indra/cmake/LLWebRTC.cmake b/indra/cmake/LLWebRTC.cmake new file mode 100644 index 0000000000..913e28c2ff --- /dev/null +++ b/indra/cmake/LLWebRTC.cmake @@ -0,0 +1 @@ +# -*- cmake -*- \ No newline at end of file diff --git a/indra/cmake/WebRTC.cmake b/indra/cmake/WebRTC.cmake new file mode 100644 index 0000000000..f8ce9c8104 --- /dev/null +++ b/indra/cmake/WebRTC.cmake @@ -0,0 +1,43 @@ +# -*- cmake -*- +include(CMakeCopyIfDifferent) + +include(Linking) + +include_guard() + +set(WEBRTC_ROOT ${CMAKE_BINARY_DIR}/../../webrtc/src) +file(COPY ${WEBRTC_ROOT}/out/Default/obj/webrtc.lib + DESTINATION ${CMAKE_BINARY_DIR}/packages/lib/release +) +set(WEBRTC_INCLUDE_DIR ${CMAKE_BINARY_DIR}/packages/include/webrtc) +file(MAKE_DIRECTORY ${WEBRTC_INCLUDE_DIR}) + +file(COPY ${WEBRTC_ROOT}/api + ${WEBRTC_ROOT}/media/base + ${WEBRTC_ROOT}/media/engine + ${WEBRTC_ROOT}/rtc_base + ${WEBRTC_ROOT}/pc + ${WEBRTC_ROOT}/p2p + ${WEBRTC_ROOT}/call + ${WEBRTC_ROOT}/media + ${WEBRTC_ROOT}/system_wrappers + ${WEBRTC_ROOT}/common_video + ${WEBRTC_ROOT}/video + ${WEBRTC_ROOT}/common_audio + ${WEBRTC_ROOT}/logging + ${WEBRTC_ROOT}/third_party/abseil-cpp/absl + DESTINATION ${WEBRTC_INCLUDE_DIR} + FILES_MATCHING PATTERN "*.h" +) + +add_library(ll::webrtc STATIC IMPORTED) + +if (LINUX) + target_link_libraries( ll::webrtc INTERFACE ../webrtc/src/obj/Default/webrtc) +elseif (DARWIN) + target_link_libraries( ll::webrtc INTERFACE ../webrtc/src/obj/Default/webrtc) +elseif (WINDOWS) + set_target_properties( ll::webrtc PROPERTIES IMPORTED_LOCATION ${CMAKE_BINARY_DIR}/packages/lib/release/webrtc.lib) + target_link_libraries( ll::webrtc INTERFACE ${CMAKE_BINARY_DIR}/packages/lib/release/webrtc.lib) +endif (LINUX) +target_include_directories( ll::webrtc INTERFACE "${WEBRTC_INCLUDE_DIR}") -- cgit v1.2.3 From a80f6070a2c80ad2798da240254da8d8a4f5f993 Mon Sep 17 00:00:00 2001 From: Roxie Linden Date: Fri, 8 Sep 2023 21:36:17 -0700 Subject: Pull webrtc down from a webserver before building. --- indra/cmake/WebRTC.cmake | 68 +++++++++++++++++++++++------------------------- 1 file changed, 33 insertions(+), 35 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/WebRTC.cmake b/indra/cmake/WebRTC.cmake index f8ce9c8104..7953d1ee1b 100644 --- a/indra/cmake/WebRTC.cmake +++ b/indra/cmake/WebRTC.cmake @@ -1,43 +1,41 @@ # -*- cmake -*- -include(CMakeCopyIfDifferent) -include(Linking) +include(FetchContent) -include_guard() - -set(WEBRTC_ROOT ${CMAKE_BINARY_DIR}/../../webrtc/src) -file(COPY ${WEBRTC_ROOT}/out/Default/obj/webrtc.lib - DESTINATION ${CMAKE_BINARY_DIR}/packages/lib/release +if (WINDOWS) +FetchContent_Declare( + webrtc + URL http://localhost:8000/webrtc.windows_x86_64.tar.bz2 + URL_HASH MD5=dfb692562770dc8c877ebfe4302e2881 + FIND_PACKAGE_ARGS NAMES webrtc + DOWNLOAD_EXTRACT_TIMESTAMP TRUE + DOWNLOAD_DIR "${LIBS_PREBUILT_DIR}/webrtc/" ) -set(WEBRTC_INCLUDE_DIR ${CMAKE_BINARY_DIR}/packages/include/webrtc) -file(MAKE_DIRECTORY ${WEBRTC_INCLUDE_DIR}) - -file(COPY ${WEBRTC_ROOT}/api - ${WEBRTC_ROOT}/media/base - ${WEBRTC_ROOT}/media/engine - ${WEBRTC_ROOT}/rtc_base - ${WEBRTC_ROOT}/pc - ${WEBRTC_ROOT}/p2p - ${WEBRTC_ROOT}/call - ${WEBRTC_ROOT}/media - ${WEBRTC_ROOT}/system_wrappers - ${WEBRTC_ROOT}/common_video - ${WEBRTC_ROOT}/video - ${WEBRTC_ROOT}/common_audio - ${WEBRTC_ROOT}/logging - ${WEBRTC_ROOT}/third_party/abseil-cpp/absl - DESTINATION ${WEBRTC_INCLUDE_DIR} - FILES_MATCHING PATTERN "*.h" +elseif (DARWIN) +FetchContent_Declare( + webrtc + URL http://localhost:8000/webrtc.macos_x86_64.tar.bz2 + URL_HASH MD5=cfbcac7da897a862f9791ea29330b814 + FIND_PACKAGE_ARGS NAMES webrtc + DOWNLOAD_EXTRACT_TIMESTAMP TRUE + DOWNLOAD_DIR "${LIBS_PREBUILT_DIR}/webrtc/" ) +endif (WINDOWS) + +FetchContent_MakeAvailable(webrtc) + +set(WEBRTC_PATH ${webrtc_SOURCE_DIR}) -add_library(ll::webrtc STATIC IMPORTED) -if (LINUX) - target_link_libraries( ll::webrtc INTERFACE ../webrtc/src/obj/Default/webrtc) +add_library( ll::webrtc INTERFACE IMPORTED ) + + +if (WINDOWS) + target_link_libraries( ll::webrtc INTERFACE "${WEBRTC_PATH}/lib/webrtc.lib" ) elseif (DARWIN) - target_link_libraries( ll::webrtc INTERFACE ../webrtc/src/obj/Default/webrtc) -elseif (WINDOWS) - set_target_properties( ll::webrtc PROPERTIES IMPORTED_LOCATION ${CMAKE_BINARY_DIR}/packages/lib/release/webrtc.lib) - target_link_libraries( ll::webrtc INTERFACE ${CMAKE_BINARY_DIR}/packages/lib/release/webrtc.lib) -endif (LINUX) -target_include_directories( ll::webrtc INTERFACE "${WEBRTC_INCLUDE_DIR}") + target_link_libraries( ll::webrtc INTERFACE "${WEBRTC_PATH}/lib/webrtc.a" ) +elseif (LINUX) + target_link_libraries( ll::webrtc INTERFACE "${WEBRTC_PATH}/lib/webrtc.a" ) +endif (WINDOWS) +target_include_directories( ll::webrtc SYSTEM INTERFACE "${WEBRTC_PATH}/include" "${WEBRTC_PATH}/include/third_party/abseil-cpp") + -- cgit v1.2.3 From 8fa09570ec91a656e55f88de882fc81fe39f35fa Mon Sep 17 00:00:00 2001 From: Roxie Linden Date: Sat, 9 Sep 2023 22:19:22 -0700 Subject: Updates to build on mac. --- indra/cmake/00-Common.cmake | 2 ++ indra/cmake/WebRTC.cmake | 26 ++++++++++++++++++++------ 2 files changed, 22 insertions(+), 6 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 24534c98d9..687ace431b 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -182,6 +182,8 @@ if (LINUX OR DARWIN) list(APPEND GCC_WARNINGS -Wno-reorder -Wno-non-virtual-dtor ) + list(APPEND GCC_WARNINGS -Wno-unused-but-set-variable -Wno-unused-variable ) + add_compile_options(${GCC_WARNINGS}) add_compile_options(-m${ADDRESS_SIZE}) endif (LINUX OR DARWIN) diff --git a/indra/cmake/WebRTC.cmake b/indra/cmake/WebRTC.cmake index 7953d1ee1b..2040c86b9f 100644 --- a/indra/cmake/WebRTC.cmake +++ b/indra/cmake/WebRTC.cmake @@ -26,16 +26,30 @@ FetchContent_MakeAvailable(webrtc) set(WEBRTC_PATH ${webrtc_SOURCE_DIR}) - add_library( ll::webrtc INTERFACE IMPORTED ) - if (WINDOWS) - target_link_libraries( ll::webrtc INTERFACE "${WEBRTC_PATH}/lib/webrtc.lib" ) + target_link_libraries( ll::webrtc INTERFACE "${WEBRTC_PATH}/lib/webrtc.lib" ) elseif (DARWIN) - target_link_libraries( ll::webrtc INTERFACE "${WEBRTC_PATH}/lib/webrtc.a" ) + FIND_LIBRARY(COREAUDIO_LIBRARY CoreAudio) + FIND_LIBRARY(COREGRAPHICS_LIBRARY CoreGraphics) + FIND_LIBRARY(AUDIOTOOLBOX_LIBRARY AudioToolbox) + FIND_LIBRARY(COREFOUNDATION_LIBRARY CoreFoundation) + FIND_LIBRARY(COCOA_LIBRARY Cocoa) + + target_link_libraries( ll::webrtc INTERFACE + "${WEBRTC_PATH}/lib/libwebrtc.a" + ${COREAUDIO_LIBRARY} + ${AUDIOTOOLBOX_LIBRARY} + ${COREGRAPHICS_LIBRARY} + ${COREFOUNDATION_LIBRARY} + ${COCOA_LIBRARY} + ) elseif (LINUX) - target_link_libraries( ll::webrtc INTERFACE "${WEBRTC_PATH}/lib/webrtc.a" ) + target_link_libraries( ll::webrtc INTERFACE "${WEBRTC_PATH}/lib/libwebrtc.a" ) endif (WINDOWS) -target_include_directories( ll::webrtc SYSTEM INTERFACE "${WEBRTC_PATH}/include" "${WEBRTC_PATH}/include/third_party/abseil-cpp") + +message("PATH: ${WEBRTC_PATH}/include") + +target_include_directories( ll::webrtc INTERFACE "${WEBRTC_PATH}/include" "${WEBRTC_PATH}/include/third_party/abseil-cpp") -- cgit v1.2.3 From 48a20c5337e16969725985dca2ec1fa6cbaa564d Mon Sep 17 00:00:00 2001 From: Roxie Linden Date: Sat, 9 Sep 2023 23:52:34 -0700 Subject: Use webrtc built binaries from temporary s3 location --- indra/cmake/WebRTC.cmake | 43 +++++++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 16 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/WebRTC.cmake b/indra/cmake/WebRTC.cmake index 2040c86b9f..c1e5df8b9d 100644 --- a/indra/cmake/WebRTC.cmake +++ b/indra/cmake/WebRTC.cmake @@ -3,23 +3,34 @@ include(FetchContent) if (WINDOWS) -FetchContent_Declare( - webrtc - URL http://localhost:8000/webrtc.windows_x86_64.tar.bz2 - URL_HASH MD5=dfb692562770dc8c877ebfe4302e2881 - FIND_PACKAGE_ARGS NAMES webrtc - DOWNLOAD_EXTRACT_TIMESTAMP TRUE - DOWNLOAD_DIR "${LIBS_PREBUILT_DIR}/webrtc/" -) + if( ADDRESS_SIZE EQUAL 32 ) + FetchContent_Declare( + webrtc + URL https://webrtc-build-releases.s3.us-west-2.amazonaws.com/webrtc.windows_x86.tar.bz2 + URL_HASH MD5=0d55e58efceed3fb48085a5f0c58881c + FIND_PACKAGE_ARGS NAMES webrtc + DOWNLOAD_EXTRACT_TIMESTAMP TRUE + DOWNLOAD_DIR "${LIBS_PREBUILT_DIR}/webrtc/" + ) + else ( ADDRESS_SIZE EQUAL 32 ) + FetchContent_Declare( + webrtc + URL https://webrtc-build-releases.s3.us-west-2.amazonaws.com/webrtc.windows_x86_64.tar.bz2 + URL_HASH MD5=dfb692562770dc8c877ebfe4302e2881 + FIND_PACKAGE_ARGS NAMES webrtc + DOWNLOAD_EXTRACT_TIMESTAMP TRUE + DOWNLOAD_DIR "${LIBS_PREBUILT_DIR}/webrtc/" + ) + endif ( ADDRESS_SIZE EQUAL 32 ) elseif (DARWIN) -FetchContent_Declare( - webrtc - URL http://localhost:8000/webrtc.macos_x86_64.tar.bz2 - URL_HASH MD5=cfbcac7da897a862f9791ea29330b814 - FIND_PACKAGE_ARGS NAMES webrtc - DOWNLOAD_EXTRACT_TIMESTAMP TRUE - DOWNLOAD_DIR "${LIBS_PREBUILT_DIR}/webrtc/" -) + FetchContent_Declare( + webrtc + URL https://webrtc-build-releases.s3.us-west-2.amazonaws.com/webrtc.macos_x86_64.tar.bz2 + URL_HASH MD5=cfbcac7da897a862f9791ea29330b814 + FIND_PACKAGE_ARGS NAMES webrtc + DOWNLOAD_EXTRACT_TIMESTAMP TRUE + DOWNLOAD_DIR "${LIBS_PREBUILT_DIR}/webrtc/" + ) endif (WINDOWS) FetchContent_MakeAvailable(webrtc) -- cgit v1.2.3 From 4451c3f420d9458e817d22666642d5899283eeda Mon Sep 17 00:00:00 2001 From: Roxie Linden Date: Sun, 10 Sep 2023 00:30:59 -0700 Subject: coding policy fixes --- indra/cmake/LLWebRTC.cmake | 1 - 1 file changed, 1 deletion(-) delete mode 100644 indra/cmake/LLWebRTC.cmake (limited to 'indra/cmake') diff --git a/indra/cmake/LLWebRTC.cmake b/indra/cmake/LLWebRTC.cmake deleted file mode 100644 index 913e28c2ff..0000000000 --- a/indra/cmake/LLWebRTC.cmake +++ /dev/null @@ -1 +0,0 @@ -# -*- cmake -*- \ No newline at end of file -- cgit v1.2.3 From 22e724b29d276bcc3d3897284072eff7b85f5a01 Mon Sep 17 00:00:00 2001 From: Roxie Linden Date: Sun, 10 Sep 2023 00:50:22 -0700 Subject: unknown warnings for TC build machines --- indra/cmake/00-Common.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/cmake') diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 687ace431b..897eabb233 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -182,7 +182,7 @@ if (LINUX OR DARWIN) list(APPEND GCC_WARNINGS -Wno-reorder -Wno-non-virtual-dtor ) - list(APPEND GCC_WARNINGS -Wno-unused-but-set-variable -Wno-unused-variable ) +# list(APPEND GCC_WARNINGS -Wno-unused-but-set-variable -Wno-unused-variable ) add_compile_options(${GCC_WARNINGS}) add_compile_options(-m${ADDRESS_SIZE}) -- cgit v1.2.3 From ad23b77664c621f76eb7e18add45bd5be2e23e42 Mon Sep 17 00:00:00 2001 From: Roxie Linden Date: Sun, 10 Sep 2023 01:42:27 -0700 Subject: TC build cmake complained about URL_HASH --- indra/cmake/WebRTC.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/WebRTC.cmake b/indra/cmake/WebRTC.cmake index c1e5df8b9d..fc664b75bf 100644 --- a/indra/cmake/WebRTC.cmake +++ b/indra/cmake/WebRTC.cmake @@ -7,7 +7,7 @@ if (WINDOWS) FetchContent_Declare( webrtc URL https://webrtc-build-releases.s3.us-west-2.amazonaws.com/webrtc.windows_x86.tar.bz2 - URL_HASH MD5=0d55e58efceed3fb48085a5f0c58881c + URL_HASH "MD5=0d55e58efceed3fb48085a5f0c58881c" FIND_PACKAGE_ARGS NAMES webrtc DOWNLOAD_EXTRACT_TIMESTAMP TRUE DOWNLOAD_DIR "${LIBS_PREBUILT_DIR}/webrtc/" @@ -16,7 +16,7 @@ if (WINDOWS) FetchContent_Declare( webrtc URL https://webrtc-build-releases.s3.us-west-2.amazonaws.com/webrtc.windows_x86_64.tar.bz2 - URL_HASH MD5=dfb692562770dc8c877ebfe4302e2881 + URL_HASH "MD5=dfb692562770dc8c877ebfe4302e2881" FIND_PACKAGE_ARGS NAMES webrtc DOWNLOAD_EXTRACT_TIMESTAMP TRUE DOWNLOAD_DIR "${LIBS_PREBUILT_DIR}/webrtc/" @@ -26,7 +26,7 @@ elseif (DARWIN) FetchContent_Declare( webrtc URL https://webrtc-build-releases.s3.us-west-2.amazonaws.com/webrtc.macos_x86_64.tar.bz2 - URL_HASH MD5=cfbcac7da897a862f9791ea29330b814 + URL_HASH "MD5=cfbcac7da897a862f9791ea29330b814" FIND_PACKAGE_ARGS NAMES webrtc DOWNLOAD_EXTRACT_TIMESTAMP TRUE DOWNLOAD_DIR "${LIBS_PREBUILT_DIR}/webrtc/" -- cgit v1.2.3 From 393769e9f932a09f82aa1a52802992089297ebbd Mon Sep 17 00:00:00 2001 From: Roxie Linden Date: Sun, 10 Sep 2023 01:50:07 -0700 Subject: Try reordering URL_HASH --- indra/cmake/WebRTC.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/WebRTC.cmake b/indra/cmake/WebRTC.cmake index fc664b75bf..7693899247 100644 --- a/indra/cmake/WebRTC.cmake +++ b/indra/cmake/WebRTC.cmake @@ -7,29 +7,29 @@ if (WINDOWS) FetchContent_Declare( webrtc URL https://webrtc-build-releases.s3.us-west-2.amazonaws.com/webrtc.windows_x86.tar.bz2 - URL_HASH "MD5=0d55e58efceed3fb48085a5f0c58881c" FIND_PACKAGE_ARGS NAMES webrtc DOWNLOAD_EXTRACT_TIMESTAMP TRUE DOWNLOAD_DIR "${LIBS_PREBUILT_DIR}/webrtc/" + URL_HASH "MD5=0d55e58efceed3fb48085a5f0c58881c" ) else ( ADDRESS_SIZE EQUAL 32 ) FetchContent_Declare( webrtc URL https://webrtc-build-releases.s3.us-west-2.amazonaws.com/webrtc.windows_x86_64.tar.bz2 - URL_HASH "MD5=dfb692562770dc8c877ebfe4302e2881" FIND_PACKAGE_ARGS NAMES webrtc DOWNLOAD_EXTRACT_TIMESTAMP TRUE DOWNLOAD_DIR "${LIBS_PREBUILT_DIR}/webrtc/" + URL_HASH "MD5=dfb692562770dc8c877ebfe4302e2881" ) endif ( ADDRESS_SIZE EQUAL 32 ) elseif (DARWIN) FetchContent_Declare( webrtc URL https://webrtc-build-releases.s3.us-west-2.amazonaws.com/webrtc.macos_x86_64.tar.bz2 - URL_HASH "MD5=cfbcac7da897a862f9791ea29330b814" FIND_PACKAGE_ARGS NAMES webrtc DOWNLOAD_EXTRACT_TIMESTAMP TRUE DOWNLOAD_DIR "${LIBS_PREBUILT_DIR}/webrtc/" + URL_HASH "MD5=cfbcac7da897a862f9791ea29330b814" ) endif (WINDOWS) -- cgit v1.2.3 From 2666504d2f116774381d0929e0986f2a67f9477c Mon Sep 17 00:00:00 2001 From: Roxie Linden Date: Sun, 10 Sep 2023 01:56:43 -0700 Subject: Cmake on TC is sure picky --- indra/cmake/WebRTC.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/WebRTC.cmake b/indra/cmake/WebRTC.cmake index 7693899247..64c41c59f8 100644 --- a/indra/cmake/WebRTC.cmake +++ b/indra/cmake/WebRTC.cmake @@ -6,7 +6,7 @@ if (WINDOWS) if( ADDRESS_SIZE EQUAL 32 ) FetchContent_Declare( webrtc - URL https://webrtc-build-releases.s3.us-west-2.amazonaws.com/webrtc.windows_x86.tar.bz2 + URL "https://webrtc-build-releases.s3.us-west-2.amazonaws.com/webrtc.windows_x86.tar.bz2" FIND_PACKAGE_ARGS NAMES webrtc DOWNLOAD_EXTRACT_TIMESTAMP TRUE DOWNLOAD_DIR "${LIBS_PREBUILT_DIR}/webrtc/" @@ -15,7 +15,7 @@ if (WINDOWS) else ( ADDRESS_SIZE EQUAL 32 ) FetchContent_Declare( webrtc - URL https://webrtc-build-releases.s3.us-west-2.amazonaws.com/webrtc.windows_x86_64.tar.bz2 + URL "https://webrtc-build-releases.s3.us-west-2.amazonaws.com/webrtc.windows_x86_64.tar.bz2" FIND_PACKAGE_ARGS NAMES webrtc DOWNLOAD_EXTRACT_TIMESTAMP TRUE DOWNLOAD_DIR "${LIBS_PREBUILT_DIR}/webrtc/" @@ -25,7 +25,7 @@ if (WINDOWS) elseif (DARWIN) FetchContent_Declare( webrtc - URL https://webrtc-build-releases.s3.us-west-2.amazonaws.com/webrtc.macos_x86_64.tar.bz2 + URL "https://webrtc-build-releases.s3.us-west-2.amazonaws.com/webrtc.macos_x86_64.tar.bz2" FIND_PACKAGE_ARGS NAMES webrtc DOWNLOAD_EXTRACT_TIMESTAMP TRUE DOWNLOAD_DIR "${LIBS_PREBUILT_DIR}/webrtc/" -- cgit v1.2.3 From 6bd6107062286194484126129f5f40b7c86808f9 Mon Sep 17 00:00:00 2001 From: Roxie Linden Date: Sun, 10 Sep 2023 02:03:30 -0700 Subject: more picky cmake --- indra/cmake/WebRTC.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/WebRTC.cmake b/indra/cmake/WebRTC.cmake index 64c41c59f8..4b2dcebbe6 100644 --- a/indra/cmake/WebRTC.cmake +++ b/indra/cmake/WebRTC.cmake @@ -6,29 +6,29 @@ if (WINDOWS) if( ADDRESS_SIZE EQUAL 32 ) FetchContent_Declare( webrtc - URL "https://webrtc-build-releases.s3.us-west-2.amazonaws.com/webrtc.windows_x86.tar.bz2" FIND_PACKAGE_ARGS NAMES webrtc DOWNLOAD_EXTRACT_TIMESTAMP TRUE DOWNLOAD_DIR "${LIBS_PREBUILT_DIR}/webrtc/" + URL "https://webrtc-build-releases.s3.us-west-2.amazonaws.com/webrtc.windows_x86.tar.bz2" URL_HASH "MD5=0d55e58efceed3fb48085a5f0c58881c" ) else ( ADDRESS_SIZE EQUAL 32 ) FetchContent_Declare( webrtc - URL "https://webrtc-build-releases.s3.us-west-2.amazonaws.com/webrtc.windows_x86_64.tar.bz2" FIND_PACKAGE_ARGS NAMES webrtc DOWNLOAD_EXTRACT_TIMESTAMP TRUE DOWNLOAD_DIR "${LIBS_PREBUILT_DIR}/webrtc/" + URL "https://webrtc-build-releases.s3.us-west-2.amazonaws.com/webrtc.windows_x86_64.tar.bz2" URL_HASH "MD5=dfb692562770dc8c877ebfe4302e2881" ) endif ( ADDRESS_SIZE EQUAL 32 ) elseif (DARWIN) FetchContent_Declare( webrtc - URL "https://webrtc-build-releases.s3.us-west-2.amazonaws.com/webrtc.macos_x86_64.tar.bz2" FIND_PACKAGE_ARGS NAMES webrtc DOWNLOAD_EXTRACT_TIMESTAMP TRUE DOWNLOAD_DIR "${LIBS_PREBUILT_DIR}/webrtc/" + URL "https://webrtc-build-releases.s3.us-west-2.amazonaws.com/webrtc.macos_x86_64.tar.bz2" URL_HASH "MD5=cfbcac7da897a862f9791ea29330b814" ) endif (WINDOWS) -- cgit v1.2.3 From 4079c05dd8c2d36a736b07d857152ae7989b1310 Mon Sep 17 00:00:00 2001 From: Roxie Linden Date: Mon, 11 Sep 2023 15:38:58 -0700 Subject: some build tweaks --- indra/cmake/WebRTC.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/WebRTC.cmake b/indra/cmake/WebRTC.cmake index 4b2dcebbe6..20417ebb41 100644 --- a/indra/cmake/WebRTC.cmake +++ b/indra/cmake/WebRTC.cmake @@ -25,11 +25,11 @@ if (WINDOWS) elseif (DARWIN) FetchContent_Declare( webrtc + URL "https://webrtc-build-releases.s3.us-west-2.amazonaws.com/webrtc.macos_x86_64.tar.bz2" + URL_HASH "MD5=cfbcac7da897a862f9791ea29330b814" FIND_PACKAGE_ARGS NAMES webrtc DOWNLOAD_EXTRACT_TIMESTAMP TRUE DOWNLOAD_DIR "${LIBS_PREBUILT_DIR}/webrtc/" - URL "https://webrtc-build-releases.s3.us-west-2.amazonaws.com/webrtc.macos_x86_64.tar.bz2" - URL_HASH "MD5=cfbcac7da897a862f9791ea29330b814" ) endif (WINDOWS) -- cgit v1.2.3 From 24379eb3eec285bf53692892d07a36aac0bad95c Mon Sep 17 00:00:00 2001 From: Roxie Linden Date: Wed, 13 Sep 2023 21:20:23 -0700 Subject: disable unused but set warnings on newer compilers on mac. --- indra/cmake/00-Common.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indra/cmake') diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 897eabb233..26a4162e42 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -182,7 +182,9 @@ if (LINUX OR DARWIN) list(APPEND GCC_WARNINGS -Wno-reorder -Wno-non-virtual-dtor ) -# list(APPEND GCC_WARNINGS -Wno-unused-but-set-variable -Wno-unused-variable ) + if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 13) + list(APPEND GCC_WARNINGS -Wno-unused-but-set-variable -Wno-unused-variable ) + endif() add_compile_options(${GCC_WARNINGS}) add_compile_options(-m${ADDRESS_SIZE}) -- cgit v1.2.3 From b831502f7862074afec4388584e791635d120abe Mon Sep 17 00:00:00 2001 From: Roxie Linden Date: Thu, 12 Oct 2023 20:10:06 -0700 Subject: reorder params as the runners have different versions of cmake --- indra/cmake/WebRTC.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/WebRTC.cmake b/indra/cmake/WebRTC.cmake index 20417ebb41..1c32607766 100644 --- a/indra/cmake/WebRTC.cmake +++ b/indra/cmake/WebRTC.cmake @@ -6,20 +6,20 @@ if (WINDOWS) if( ADDRESS_SIZE EQUAL 32 ) FetchContent_Declare( webrtc + URL "https://webrtc-build-releases.s3.us-west-2.amazonaws.com/webrtc.windows_x86.tar.bz2" + URL_HASH "MD5=0d55e58efceed3fb48085a5f0c58881c" FIND_PACKAGE_ARGS NAMES webrtc DOWNLOAD_EXTRACT_TIMESTAMP TRUE DOWNLOAD_DIR "${LIBS_PREBUILT_DIR}/webrtc/" - URL "https://webrtc-build-releases.s3.us-west-2.amazonaws.com/webrtc.windows_x86.tar.bz2" - URL_HASH "MD5=0d55e58efceed3fb48085a5f0c58881c" ) else ( ADDRESS_SIZE EQUAL 32 ) FetchContent_Declare( webrtc + URL "https://webrtc-build-releases.s3.us-west-2.amazonaws.com/webrtc.windows_x86_64.tar.bz2" + URL_HASH "MD5=dfb692562770dc8c877ebfe4302e2881" FIND_PACKAGE_ARGS NAMES webrtc DOWNLOAD_EXTRACT_TIMESTAMP TRUE DOWNLOAD_DIR "${LIBS_PREBUILT_DIR}/webrtc/" - URL "https://webrtc-build-releases.s3.us-west-2.amazonaws.com/webrtc.windows_x86_64.tar.bz2" - URL_HASH "MD5=dfb692562770dc8c877ebfe4302e2881" ) endif ( ADDRESS_SIZE EQUAL 32 ) elseif (DARWIN) -- cgit v1.2.3 From 7246f55290abda53c211b335e01f9a9182c7513f Mon Sep 17 00:00:00 2001 From: Roxie Linden Date: Tue, 9 Jan 2024 11:57:01 -0800 Subject: New WebRTC with echo cancellation fix. Also, start/stop recording depending on whether WebRTC has negotiated. --- indra/cmake/WebRTC.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/WebRTC.cmake b/indra/cmake/WebRTC.cmake index 1c32607766..2878d7dd88 100644 --- a/indra/cmake/WebRTC.cmake +++ b/indra/cmake/WebRTC.cmake @@ -7,7 +7,7 @@ if (WINDOWS) FetchContent_Declare( webrtc URL "https://webrtc-build-releases.s3.us-west-2.amazonaws.com/webrtc.windows_x86.tar.bz2" - URL_HASH "MD5=0d55e58efceed3fb48085a5f0c58881c" + URL_HASH "MD5=cefbd446b1b152ac08217fc78648fb99" FIND_PACKAGE_ARGS NAMES webrtc DOWNLOAD_EXTRACT_TIMESTAMP TRUE DOWNLOAD_DIR "${LIBS_PREBUILT_DIR}/webrtc/" @@ -16,7 +16,7 @@ if (WINDOWS) FetchContent_Declare( webrtc URL "https://webrtc-build-releases.s3.us-west-2.amazonaws.com/webrtc.windows_x86_64.tar.bz2" - URL_HASH "MD5=dfb692562770dc8c877ebfe4302e2881" + URL_HASH "MD5=b7a93b111e51ebcda21701c009c0676c" FIND_PACKAGE_ARGS NAMES webrtc DOWNLOAD_EXTRACT_TIMESTAMP TRUE DOWNLOAD_DIR "${LIBS_PREBUILT_DIR}/webrtc/" @@ -26,7 +26,7 @@ elseif (DARWIN) FetchContent_Declare( webrtc URL "https://webrtc-build-releases.s3.us-west-2.amazonaws.com/webrtc.macos_x86_64.tar.bz2" - URL_HASH "MD5=cfbcac7da897a862f9791ea29330b814" + URL_HASH "MD5=a965974e1d9fc7f55b852a8ff8ccf9a9" FIND_PACKAGE_ARGS NAMES webrtc DOWNLOAD_EXTRACT_TIMESTAMP TRUE DOWNLOAD_DIR "${LIBS_PREBUILT_DIR}/webrtc/" -- cgit v1.2.3 From 6719d9fa52d8b981276c8f9e867e3b50b0abef13 Mon Sep 17 00:00:00 2001 From: Roxie Linden Date: Thu, 7 Mar 2024 01:26:07 -0800 Subject: update webrtc --- indra/cmake/WebRTC.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/WebRTC.cmake b/indra/cmake/WebRTC.cmake index 2878d7dd88..4032398c01 100644 --- a/indra/cmake/WebRTC.cmake +++ b/indra/cmake/WebRTC.cmake @@ -16,7 +16,7 @@ if (WINDOWS) FetchContent_Declare( webrtc URL "https://webrtc-build-releases.s3.us-west-2.amazonaws.com/webrtc.windows_x86_64.tar.bz2" - URL_HASH "MD5=b7a93b111e51ebcda21701c009c0676c" + URL_HASH "MD5=6e25b99284215933ec1571b6e60c1030" FIND_PACKAGE_ARGS NAMES webrtc DOWNLOAD_EXTRACT_TIMESTAMP TRUE DOWNLOAD_DIR "${LIBS_PREBUILT_DIR}/webrtc/" @@ -26,7 +26,7 @@ elseif (DARWIN) FetchContent_Declare( webrtc URL "https://webrtc-build-releases.s3.us-west-2.amazonaws.com/webrtc.macos_x86_64.tar.bz2" - URL_HASH "MD5=a965974e1d9fc7f55b852a8ff8ccf9a9" + URL_HASH "MD5=6849e81773135290f5c70cbf679992fb" FIND_PACKAGE_ARGS NAMES webrtc DOWNLOAD_EXTRACT_TIMESTAMP TRUE DOWNLOAD_DIR "${LIBS_PREBUILT_DIR}/webrtc/" -- cgit v1.2.3 From 994039c948c29dc4664f7c2f2ec2c87001117234 Mon Sep 17 00:00:00 2001 From: Roxie Linden Date: Fri, 8 Mar 2024 22:49:05 -0800 Subject: Use webrtc autobuild package --- indra/cmake/WebRTC.cmake | 50 ++++++++---------------------------------------- 1 file changed, 8 insertions(+), 42 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/WebRTC.cmake b/indra/cmake/WebRTC.cmake index 4032398c01..909a1345ed 100644 --- a/indra/cmake/WebRTC.cmake +++ b/indra/cmake/WebRTC.cmake @@ -1,46 +1,15 @@ # -*- cmake -*- +include(Linking) +include(Prebuilt) -include(FetchContent) - -if (WINDOWS) - if( ADDRESS_SIZE EQUAL 32 ) - FetchContent_Declare( - webrtc - URL "https://webrtc-build-releases.s3.us-west-2.amazonaws.com/webrtc.windows_x86.tar.bz2" - URL_HASH "MD5=cefbd446b1b152ac08217fc78648fb99" - FIND_PACKAGE_ARGS NAMES webrtc - DOWNLOAD_EXTRACT_TIMESTAMP TRUE - DOWNLOAD_DIR "${LIBS_PREBUILT_DIR}/webrtc/" - ) - else ( ADDRESS_SIZE EQUAL 32 ) - FetchContent_Declare( - webrtc - URL "https://webrtc-build-releases.s3.us-west-2.amazonaws.com/webrtc.windows_x86_64.tar.bz2" - URL_HASH "MD5=6e25b99284215933ec1571b6e60c1030" - FIND_PACKAGE_ARGS NAMES webrtc - DOWNLOAD_EXTRACT_TIMESTAMP TRUE - DOWNLOAD_DIR "${LIBS_PREBUILT_DIR}/webrtc/" - ) - endif ( ADDRESS_SIZE EQUAL 32 ) -elseif (DARWIN) - FetchContent_Declare( - webrtc - URL "https://webrtc-build-releases.s3.us-west-2.amazonaws.com/webrtc.macos_x86_64.tar.bz2" - URL_HASH "MD5=6849e81773135290f5c70cbf679992fb" - FIND_PACKAGE_ARGS NAMES webrtc - DOWNLOAD_EXTRACT_TIMESTAMP TRUE - DOWNLOAD_DIR "${LIBS_PREBUILT_DIR}/webrtc/" - ) -endif (WINDOWS) - -FetchContent_MakeAvailable(webrtc) - -set(WEBRTC_PATH ${webrtc_SOURCE_DIR}) +include_guard() add_library( ll::webrtc INTERFACE IMPORTED ) +target_include_directories( ll::webrtc SYSTEM INTERFACE "${LIBS_PREBUILT_DIR}/include/webrtc" "${LIBS_PREBUILT_DIR}/include/webrtc/third_party/abseil-cpp") +use_prebuilt_binary(webrtc-shim) if (WINDOWS) - target_link_libraries( ll::webrtc INTERFACE "${WEBRTC_PATH}/lib/webrtc.lib" ) + target_link_libraries( ll::webrtc INTERFACE webrtc.lib ) elseif (DARWIN) FIND_LIBRARY(COREAUDIO_LIBRARY CoreAudio) FIND_LIBRARY(COREGRAPHICS_LIBRARY CoreGraphics) @@ -49,7 +18,7 @@ elseif (DARWIN) FIND_LIBRARY(COCOA_LIBRARY Cocoa) target_link_libraries( ll::webrtc INTERFACE - "${WEBRTC_PATH}/lib/libwebrtc.a" + libwebrtc.a ${COREAUDIO_LIBRARY} ${AUDIOTOOLBOX_LIBRARY} ${COREGRAPHICS_LIBRARY} @@ -57,10 +26,7 @@ elseif (DARWIN) ${COCOA_LIBRARY} ) elseif (LINUX) - target_link_libraries( ll::webrtc INTERFACE "${WEBRTC_PATH}/lib/libwebrtc.a" ) + target_link_libraries( ll::webrtc INTERFACE libwebrtc ) endif (WINDOWS) -message("PATH: ${WEBRTC_PATH}/include") - -target_include_directories( ll::webrtc INTERFACE "${WEBRTC_PATH}/include" "${WEBRTC_PATH}/include/third_party/abseil-cpp") -- cgit v1.2.3 From 2f40b1fcef766f87f3185333fa05fbf4f3244073 Mon Sep 17 00:00:00 2001 From: Roxie Linden Date: Mon, 18 Mar 2024 17:13:36 -0700 Subject: update to use public github-based release of autobuild webrtc --- indra/cmake/WebRTC.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/cmake') diff --git a/indra/cmake/WebRTC.cmake b/indra/cmake/WebRTC.cmake index 909a1345ed..a9adc41831 100644 --- a/indra/cmake/WebRTC.cmake +++ b/indra/cmake/WebRTC.cmake @@ -6,7 +6,7 @@ include_guard() add_library( ll::webrtc INTERFACE IMPORTED ) target_include_directories( ll::webrtc SYSTEM INTERFACE "${LIBS_PREBUILT_DIR}/include/webrtc" "${LIBS_PREBUILT_DIR}/include/webrtc/third_party/abseil-cpp") -use_prebuilt_binary(webrtc-shim) +use_prebuilt_binary(webrtc) if (WINDOWS) target_link_libraries( ll::webrtc INTERFACE webrtc.lib ) -- cgit v1.2.3 From c7461061b8113fa258611b1a31f16a119fad1a2c Mon Sep 17 00:00:00 2001 From: Roxie Linden Date: Sun, 19 May 2024 22:59:09 -0700 Subject: Get rid of a deprecated warning in Linux builds --- indra/cmake/WebRTC.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/cmake') diff --git a/indra/cmake/WebRTC.cmake b/indra/cmake/WebRTC.cmake index a9adc41831..0127a0cb03 100644 --- a/indra/cmake/WebRTC.cmake +++ b/indra/cmake/WebRTC.cmake @@ -26,7 +26,7 @@ elseif (DARWIN) ${COCOA_LIBRARY} ) elseif (LINUX) - target_link_libraries( ll::webrtc INTERFACE libwebrtc ) + target_link_libraries( ll::webrtc INTERFACE libwebrtc.a X11 ) endif (WINDOWS) -- cgit v1.2.3 From eaa04bddeb6ca3b0db14854c216c6c4ffe0319f4 Mon Sep 17 00:00:00 2001 From: Brad Linden Date: Mon, 10 Jun 2024 11:52:04 -0700 Subject: Attempted workaround for actions/runner-images#10004 build failures. --- indra/cmake/00-Common.cmake | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'indra/cmake') diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 690159583a..4471380c6b 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -103,6 +103,11 @@ if (WINDOWS) string(REPLACE "/Zi" "/Z7" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}") string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}") endif() + + # workaround for github runner image breakage: + # https://github.com/actions/runner-images/issues/10004#issuecomment-2153445161 + # can be removed after the above issue is resolved and deployed across GHA + add_compile_definitions(_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR) endif (WINDOWS) -- cgit v1.2.3