From d3521b4462195cfe882b2cc8eb4e7c5e948c0fb6 Mon Sep 17 00:00:00 2001 From: Nicky Date: Wed, 13 Apr 2022 10:28:46 +0200 Subject: Remove obsolete and unmaintained USE_SYSTEMLIBS --- indra/cmake/DBusGlib.cmake | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) (limited to 'indra/cmake/DBusGlib.cmake') diff --git a/indra/cmake/DBusGlib.cmake b/indra/cmake/DBusGlib.cmake index 5e46b6711a..7c95bf8c20 100644 --- a/indra/cmake/DBusGlib.cmake +++ b/indra/cmake/DBusGlib.cmake @@ -1,24 +1,17 @@ # -*- cmake -*- include(Prebuilt) -if (USESYSTEMLIBS) - include(FindPkgConfig) - - pkg_check_modules(DBUSGLIB REQUIRED dbus-glib-1) - -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) +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 + ) if (DBUSGLIB_FOUND) set(DBUSGLIB ON CACHE BOOL "Build with dbus-glib message bus support.") -- cgit v1.2.3 From 2b151e0aefd54671e1be504269f10318d303dccb Mon Sep 17 00:00:00 2001 From: Nicky Date: Mon, 18 Apr 2022 18:11:43 +0200 Subject: Round one to support conan for 3P packages, this allows to build the viewer on Linux again. --- indra/cmake/DBusGlib.cmake | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) (limited to 'indra/cmake/DBusGlib.cmake') diff --git a/indra/cmake/DBusGlib.cmake b/indra/cmake/DBusGlib.cmake index 7c95bf8c20..ce5d10be5c 100644 --- a/indra/cmake/DBusGlib.cmake +++ b/indra/cmake/DBusGlib.cmake @@ -1,22 +1,13 @@ # -*- cmake -*- include(Prebuilt) -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 - ) +add_library( ll::dbus INTERFACE IMPORTED) + +# Only define this when using conan, lls prebuild is brokenb +if( USE_CONAN ) + target_compile_definitions( ll::dbus INTERFACE LL_DBUS_ENABLED ) +endif() +use_conan_binary(dbus) -if (DBUSGLIB_FOUND) - set(DBUSGLIB ON CACHE BOOL "Build with dbus-glib message bus support.") -endif (DBUSGLIB_FOUND) +use_prebuilt_binary(dbus_glib) -if (DBUSGLIB) - add_definitions(-DLL_DBUS_ENABLED=1) -endif (DBUSGLIB) -- cgit v1.2.3 From 756a10eeace5891c17c6894b0df44f2b9b3ea078 Mon Sep 17 00:00:00 2001 From: Nicky Date: Sun, 1 May 2022 13:37:44 +0200 Subject: Simplify cmake files by uaing generator expressions and be more configuration specific, rather than staging files to Release and RelWithdebInfo all the time --- indra/cmake/DBusGlib.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/cmake/DBusGlib.cmake') diff --git a/indra/cmake/DBusGlib.cmake b/indra/cmake/DBusGlib.cmake index ce5d10be5c..9151742fe0 100644 --- a/indra/cmake/DBusGlib.cmake +++ b/indra/cmake/DBusGlib.cmake @@ -3,7 +3,7 @@ include(Prebuilt) add_library( ll::dbus INTERFACE IMPORTED) -# Only define this when using conan, lls prebuild is brokenb +# Only define this when using conan, lls prebuild is broken if( USE_CONAN ) target_compile_definitions( ll::dbus INTERFACE LL_DBUS_ENABLED ) endif() -- cgit v1.2.3 From 3f31d0b5a70af4ebf746d40d478b4e948e904a87 Mon Sep 17 00:00:00 2001 From: Nicky Date: Sun, 17 Jul 2022 17:51:25 +0200 Subject: Be more explicit: Rename use_conan_binary to use_system_binary, this will allow us to reuse the macro for more than just conan. --- indra/cmake/DBusGlib.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/cmake/DBusGlib.cmake') diff --git a/indra/cmake/DBusGlib.cmake b/indra/cmake/DBusGlib.cmake index 9151742fe0..f75018ad0e 100644 --- a/indra/cmake/DBusGlib.cmake +++ b/indra/cmake/DBusGlib.cmake @@ -3,11 +3,11 @@ include(Prebuilt) add_library( ll::dbus INTERFACE IMPORTED) -# Only define this when using conan, lls prebuild is broken -if( USE_CONAN ) +# 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_conan_binary(dbus) +use_system_binary(dbus) use_prebuilt_binary(dbus_glib) -- cgit v1.2.3