diff options
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/00-Common.cmake | 2 | ||||
| -rw-r--r-- | indra/cmake/WebRTC.cmake | 26 | 
2 files changed, 22 insertions, 6 deletions
| 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") | 
