diff options
| author | Erik Kundiman <erik@megapahit.org> | 2026-05-19 19:07:37 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2026-05-19 19:07:37 +0800 |
| commit | da03d920bc2daff0934987d480a4a47c54fd90b3 (patch) | |
| tree | d590998c428b350776b07cb3a1f7073194cc780a /indra | |
| parent | c8f1c4e4123df15fd27e6559ff88885ceab0aa29 (diff) | |
Use FLTK 1.4 on Ubuntu instead of 1.3 now on 26.04
See commit 21ef63545ca07ef625edb742b2b3d1473bf33f13
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/UI.cmake | 2 | ||||
| -rw-r--r-- | indra/newview/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake index ac45838427..dc8d84217a 100644 --- a/indra/cmake/UI.cmake +++ b/indra/cmake/UI.cmake @@ -12,7 +12,7 @@ if (LINUX OR CMAKE_SYSTEM_NAME MATCHES FreeBSD) return() endif() - if (${LINUX_DISTRO} MATCHES debian) + if (${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}) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index f0e6a97675..8c03639e3d 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -2385,7 +2385,7 @@ if (LINUX) set(CPACK_DEBIAN_PACKAGE_DEPENDS "libalut0, libaprutil1t64, libboost-fiber1.83.0, libboost-filesystem1.83.0, libboost-program-options1.83.0, libboost-regex1.83.0, libboost-thread1.83.0, libboost-url1.83.0, libexpat1, libfltk1.4, libgles-dev, libglu1-mesa, libhunspell-1.7-0, libmeshoptimizer2d, libminizip1t64, libnghttp2-14, libnspr4, libnss3, libopenjp2-7, libsdl2-2.0-0, libvlc5, libvorbisenc2, libvorbisfile3, vlc-plugin-base" CACHE STRING "Debian package dependencies.") else () - set(CPACK_DEBIAN_PACKAGE_DEPENDS "libalut0, libaprutil1t64, libboost-fiber1.90.0, libboost-filesystem1.90.0, libboost-program-options1.90.0, libboost-regex1.90.0, libboost-thread1.90.0, libboost-url1.90.0, libexpat1, libfltk1.3t64, libgles-dev, libglu1-mesa, libhunspell-1.7-0, libmeshoptimizer2d, libminizip1t64, libnghttp2-14, libnspr4, libnss3, libopenjp2-7, libsdl2-2.0-0, libvlc5, libvorbisenc2, libvorbisfile3, vlc-plugin-base" + set(CPACK_DEBIAN_PACKAGE_DEPENDS "libalut0, libaprutil1t64, libboost-fiber1.90.0, libboost-filesystem1.90.0, libboost-program-options1.90.0, libboost-regex1.90.0, libboost-thread1.90.0, libboost-url1.90.0, libexpat1, libfltk1.4, libgles-dev, libglu1-mesa, libhunspell-1.7-0, libmeshoptimizer2d, libminizip1t64, libnghttp2-14, libnspr4, libnss3, libopenjp2-7, libsdl2-2.0-0, libvlc5, libvorbisenc2, libvorbisfile3, vlc-plugin-base" CACHE STRING "Debian package dependencies.") endif () elseif (${LINUX_DISTRO} MATCHES fedora OR (${LINUX_DISTRO} MATCHES opensuse-tumbleweed)) |