From 6e730270997f21c8d4a27e68f5e92f58e6a133ec Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sun, 23 Jun 2024 13:34:56 -0400
Subject: [PATCH] #31 Probably fix dbus service not being built in
---
indra/cmake/SDBusCPP.cmake | 2 +-
indra/newview/CMakeLists.txt | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/indra/cmake/SDBusCPP.cmake b/indra/cmake/SDBusCPP.cmake
index f7d25c6a254..31dcd40a12e 100644
--- a/indra/cmake/SDBusCPP.cmake
+++ b/indra/cmake/SDBusCPP.cmake
@@ -8,7 +8,7 @@ if(LINUX)
use_system_binary(sdbus-cpp)
use_prebuilt_binary(sdbus-cpp)
- target_compile_definitions( ll::sdbus-cpp INTERFACE LL_DBUS_ENABLED )
+ target_compile_definitions( ll::sdbus-cpp INTERFACE LL_DBUS_ENABLED=1 )
target_link_libraries(ll::sdbus-cpp INTERFACE sdbus-c++)
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index f3aa40b0c02..15f7f95cd0c 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -2107,6 +2107,10 @@ target_link_libraries(${VIEWER_BINARY_NAME}
ll::versioninfo
)
+if( TARGET ll::sdbus-cpp )
+ target_link_libraries(${VIEWER_BINARY_NAME} PUBLIC ll::sdbus-cpp )
+endif()
+
if( TARGET ll::nvapi )
target_link_libraries(${VIEWER_BINARY_NAME} PUBLIC ll::nvapi )
endif()
--
GitLab