diff options
| author | Dave Parks <davep@lindenlab.com> | 2023-03-31 11:57:48 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2023-03-31 11:57:48 -0500 |
| commit | 7d144fcb2a1b0aff1b59e378c652649c3d03e94f (patch) | |
| tree | de3bfe3ce90677cc4d7ab25b8aeaf5853c009068 /indra/cmake/DBusGlib.cmake | |
| parent | 0fe09bd968b987605123e99efb2fa040a988a942 (diff) | |
| parent | e4173ea5cc1ef9b1677ac87a0f7c8acbe73414ee (diff) | |
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
Diffstat (limited to 'indra/cmake/DBusGlib.cmake')
| -rw-r--r-- | indra/cmake/DBusGlib.cmake | 31 |
1 files changed, 8 insertions, 23 deletions
diff --git a/indra/cmake/DBusGlib.cmake b/indra/cmake/DBusGlib.cmake index 5e46b6711a..c9b727ca9d 100644 --- a/indra/cmake/DBusGlib.cmake +++ b/indra/cmake/DBusGlib.cmake @@ -1,29 +1,14 @@ # -*- cmake -*- include(Prebuilt) -if (USESYSTEMLIBS) - include(FindPkgConfig) +add_library( ll::dbus INTERFACE IMPORTED) - pkg_check_modules(DBUSGLIB REQUIRED dbus-glib-1) +if( LINUX ) + # Only define this when not using the prebuild 3ps, lls prebuild is broken + if( NOT USE_AUTOBUILD_3P ) + target_compile_definitions( ll::dbus INTERFACE LL_DBUS_ENABLED ) + endif() + use_system_binary(dbus) -elseif (LINUX) use_prebuilt_binary(dbus_glib) - set(DBUSGLIB_FOUND ON FORCE BOOL) - set(DBUSGLIB_INCLUDE_DIRS - ${LIBS_PREBUILT_DIR}/include/dbus - ) - # We don't need to explicitly link against dbus-glib itself, because - # the viewer probes for the system's copy at runtime. - set(DBUSGLIB_LIBRARIES - gobject-2.0 - glib-2.0 - ) -endif (USESYSTEMLIBS) - -if (DBUSGLIB_FOUND) - set(DBUSGLIB ON CACHE BOOL "Build with dbus-glib message bus support.") -endif (DBUSGLIB_FOUND) - -if (DBUSGLIB) - add_definitions(-DLL_DBUS_ENABLED=1) -endif (DBUSGLIB) +endif() |