diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2024-05-19 22:59:09 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2024-05-19 22:59:09 -0700 |
| commit | c7461061b8113fa258611b1a31f16a119fad1a2c (patch) | |
| tree | bfce2e902f043de6f14211cc693dc97fc296e9f5 | |
| parent | ddbd1ab47ea6cd76ed3e6bf32ffaeb73a32b4a97 (diff) | |
Get rid of a deprecated warning in Linux builds
| -rw-r--r-- | indra/cmake/WebRTC.cmake | 2 | ||||
| -rw-r--r-- | indra/llwebrtc/CMakeLists.txt | 9 |
2 files changed, 6 insertions, 5 deletions
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) diff --git a/indra/llwebrtc/CMakeLists.txt b/indra/llwebrtc/CMakeLists.txt index 29dc1df8d6..fd1788c5d4 100644 --- a/indra/llwebrtc/CMakeLists.txt +++ b/indra/llwebrtc/CMakeLists.txt @@ -10,8 +10,9 @@ include(WebRTC) project(llwebrtc) -set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++ -lc++abi") - +if (LINUX) + add_compile_options(-Wno-deprecated-declarations) # webrtc::CreateAudioDeviceWithDataObserver is deprecated +endif (LINUX) set(llwebrtc_SOURCE_FILES llwebrtc.cpp @@ -26,7 +27,7 @@ set(llwebrtc_HEADER_FILES list(APPEND llwebrtc_SOURCE_FILES ${llwebrtc_HEADER_FILES}) add_library (llwebrtc SHARED ${llwebrtc_SOURCE_FILES}) - + set_target_properties(llwebrtc PROPERTIES PUBLIC_HEADER llwebrtc.h) if (WINDOWS) @@ -44,7 +45,7 @@ elseif (LINUX) target_link_libraries(llwebrtc PRIVATE ll::webrtc) endif (WINDOWS) -target_include_directories( llwebrtc INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) +target_include_directories( llwebrtc INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) if (WINDOWS) set_property(TARGET llwebrtc PROPERTY |