From 7e47eff5042c2fb897c8eee1219889a84ca3bf36 Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Fri, 31 Jul 2026 19:29:02 +0800 Subject: Compare LINUX_DISTRO with freedesktop on Flatpak so no need for USE_FLATPAK, and just maybe there are some other platforms that use this runtime as the distro info. --- indra/cmake/UI.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/cmake/UI.cmake') diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake index 24dc121533..058d00d49d 100644 --- a/indra/cmake/UI.cmake +++ b/indra/cmake/UI.cmake @@ -6,7 +6,7 @@ include(GLIB) add_library( ll::uilibraries INTERFACE IMPORTED ) if (LINUX OR CMAKE_SYSTEM_NAME MATCHES FreeBSD) - if (USE_FLATPAK) + if (${LINUX_DISTRO} MATCHES freedesktop) use_prebuilt_binary(fltk) endif () target_compile_definitions(ll::uilibraries INTERFACE LL_FLTK=1 LL_X11=1 ) @@ -15,7 +15,7 @@ if (LINUX OR CMAKE_SYSTEM_NAME MATCHES FreeBSD) return() endif() - if (USE_FLATPAK OR (${LINUX_DISTRO} MATCHES debian) OR (${LINUX_DISTRO} MATCHES ubuntu)) + if (${LINUX_DISTRO} MATCHES freedesktop OR (${LINUX_DISTRO} MATCHES debian) OR (${LINUX_DISTRO} MATCHES ubuntu)) include(FindPkgConfig) pkg_check_modules(CAIRO REQUIRED cairo) target_include_directories(ll::uilibraries SYSTEM INTERFACE ${CAIRO_INCLUDE_DIRS}) @@ -54,7 +54,7 @@ if( WINDOWS ) ) endif() -if (USE_FLATPAK) +if (${LINUX_DISTRO} MATCHES freedesktop) target_include_directories( ll::uilibraries SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include ) -- cgit v1.3