diff options
| author | Erik Kundiman <erik@megapahit.org> | 2026-07-31 19:34:11 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2026-07-31 19:34:11 +0800 |
| commit | cdd2eaf40207117722d046fcc9c5707b884c4b49 (patch) | |
| tree | 832adf924846582cbc649686788cfba6a740604b /indra/cmake/UI.cmake | |
| parent | a6eb1586ae4bd4e81e7d03c91c27ffec78a32cf7 (diff) | |
| parent | 7e47eff5042c2fb897c8eee1219889a84ca3bf36 (diff) | |
Merge branch 'main' into 26.326.3
Diffstat (limited to 'indra/cmake/UI.cmake')
| -rw-r--r-- | indra/cmake/UI.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
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 ) |