diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-08-28 13:27:42 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-08-28 13:29:58 +0800 |
| commit | f8b36bceb14b85b848f1e4f3f075a5e7a64c0ae3 (patch) | |
| tree | 0a1ca9a58d3bcb2152f23cd77eec35a95fc3f51c | |
| parent | ff6c034db9d5a7a881b9b51f0ff2b5417856baa8 (diff) | |
Fix left out & error-causing from previous commit
| -rw-r--r-- | indra/cmake/WebRTC.cmake | 1 | ||||
| -rw-r--r-- | indra/llwebrtc/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | indra/newview/CMakeLists.txt | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/indra/cmake/WebRTC.cmake b/indra/cmake/WebRTC.cmake index ab35f5149d..79d8d30991 100644 --- a/indra/cmake/WebRTC.cmake +++ b/indra/cmake/WebRTC.cmake @@ -6,7 +6,6 @@ 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") -target_compile_definitions( ll::webrtc INTERFACE LL_WEBRTC=1) if (CMAKE_OSX_ARCHITECTURES MATCHES arm64) if (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/webrtc_installed OR NOT ${webrtc_installed} EQUAL 0) if (NOT EXISTS ${CMAKE_BINARY_DIR}/libwebrtc-macos-arm64.tar.xz) diff --git a/indra/llwebrtc/CMakeLists.txt b/indra/llwebrtc/CMakeLists.txt index 425376d248..21ce222aea 100644 --- a/indra/llwebrtc/CMakeLists.txt +++ b/indra/llwebrtc/CMakeLists.txt @@ -28,9 +28,11 @@ list(APPEND llwebrtc_SOURCE_FILES ${llwebrtc_HEADER_FILES}) add_library (llwebrtc SHARED ${llwebrtc_SOURCE_FILES}) -if (NOT INSTALL) +if (USESYSTEMLIBS) +target_compile_definitions(llwebrtc INTERFACE LL_WEBRTC=1) +else (USESYSTEMLIBS) set_target_properties(llwebrtc PROPERTIES PUBLIC_HEADER llwebrtc.h) -endif () +endif (USESYSTEMLIBS) if (WINDOWS) cmake_policy(SET CMP0091 NEW) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index bf190f1e95..0890288a02 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -741,9 +741,9 @@ set(viewer_SOURCE_FILES pipeline.cpp ) -if (LINUX OR CMAKE_SYSTEM_NAME MATCHES FreeBSD) +if (${LINUX_DISTRO} MATCHES fedora OR (${LINUX_DISTRO} MATCHES opensuse-tumbleweed) OR CMAKE_SYSTEM_NAME MATCHES FreeBSD) list(REMOVE_ITEM viewer_SOURCE_FILES llvoicewebrtc.cpp) -endif () +endif (${LINUX_DISTRO} MATCHES fedora OR (${LINUX_DISTRO} MATCHES opensuse-tumbleweed) OR CMAKE_SYSTEM_NAME MATCHES FreeBSD) set(VIEWER_BINARY_NAME "secondlife-bin" CACHE STRING "The name of the viewer executable to create.") |