summaryrefslogtreecommitdiff
path: root/indra/cmake
AgeCommit message (Collapse)Author
2024-08-10Fix 7c716d6d516f99628655352a0e679455263924e2 logicsErik Kundiman
2024-08-09Merge remote-tracking branch 'origin/release/2024.06-atlasaurus' into developBrad Linden
# Conflicts: # .github/workflows/build.yaml # indra/llui/llscrolllistctrl.cpp
2024-08-09Merge remote-tracking branch 'origin/release/webrtc-voice' into ↵Brad Linden
release/2024.06-atlasaurus # Conflicts: # .github/workflows/build.yaml # indra/newview/CMakeLists.txt # indra/newview/llspeakers.cpp # indra/newview/llvoicechannel.cpp # indra/newview/llvoicechannel.h # indra/newview/llvoiceclient.cpp # indra/newview/llvoiceclient.h # indra/newview/llvoicewebrtc.cpp
2024-08-09Set most CPACK variables before including CPackErik Kundiman
so that we don't have to run cmake twice just to pick up those variables.
2024-08-09Download Dullahan macOS arm64 only if it hasn'tErik Kundiman
2024-08-09Automatically download and install DullahanErik Kundiman
For now it still downloads even though the builder has downloaded the files before. You could temporarily comment out the relevant use_prebuilt_binary calls to skip all the re-downloads and re-installs.
2024-08-09Merge remote-tracking branch 'secondlife/release/webrtc-voice' into webrtc-voiceErik Kundiman
2024-08-09Merge branch 'main' into webrtc-voiceErik Kundiman
2024-08-08CR fixesRoxie Linden
2024-08-08Update libexpat to 2.6.2 and libapr 1.7.4 (#2214)Rye Mutt
2024-08-08Install GLH, Mikktspace, TinyEXR, TinyGLTF & LLCAErik Kundiman
automatically. Fix tab to spaces too.
2024-08-08Long parameters go into new lines in FMOD CMakeErik Kundiman
2024-08-08Make sure lib/release exists before copying FMODErik Kundiman
Since llaudio is configured before any other LL library, FMOD gets to be checked first that has a binary library.
2024-08-08FreeBSD uses linux64 package when it's commonErik Kundiman
For example, emoji_shortcodes, it's actually common, not a platform specific binary, so it can be used by FBSD as well.
2024-08-08Automate viewer fonts & emoji shortcodes installErik Kundiman
Also minimise ViewerMiscLibs.cmake diff from upstream.
2024-08-08Alternative to Autobuild-based use_prebuilt_binaryErik Kundiman
It still parses autobuild.xml, but using `xmllint --xpath`. It searches for the "common" version of the package first, if not found then it searches for the platform specific version. The URL parsed is then fed to cURL, determining our own output file name (since I couldn't find a way to extract remote file name easily using cURL) assuming the ones we need all have tar.zst extension now. It downloads to /tmp and finally extracts to packages.
2024-08-08Install FMOD 2.03.02 automatically on GNU/LinuxErik Kundiman
2024-08-07Open VLC dmg automaticallyErik Kundiman
It's assumed any relevant VLC dmg has been downloaded to ~/Downloads/.
2024-08-07Install FMOD automatically on macOSErik Kundiman
It's assumed that fmodstudioapi20223mac-installer.dmg has been downloaded to ~/Downloads/.
2024-08-05Build mac symbols for multiple binaries/dynamic libraries and upload them ↵Roxie Linden
all to bugsplat
2024-08-05Update ogg_vorbis to 1.3.5-1.3.7 (#2186)Rye Mutt
2024-08-03Bring back FMOD, to be used on Fedora only, thoughErik Kundiman
https://megapahit.com/show_bug.cgi?id=64 Dullahan is still not working, something in webrtc-voice is breaking it too. But at least we're halfway now that we don't have to use Fedora's OpenAL that is in conflict with Dullahan/CEF.
2024-08-03Merge branch 'main' into webrtc-voiceErik Kundiman
2024-08-02Update to libhunspell 1.7.2-r1 (#2175)Rye Mutt
2024-08-02Remove dead pcre library dependency (#2177)Rye Mutt
2024-08-02Update from jpeglib to libjpeg-turbo 3.0.3 (#2161, #2173)Rye Mutt
2024-07-29Replace liburiparser with boost::urlRye Mutt
2024-07-29GLM on GNU/Linux distros aren't updated enoughErik Kundiman
The viewer codebase requires GLM 1.0.x, not 0.9.x.
2024-07-29Fix lltest failure by outputting to the sharedlibs dir like other tests on ↵Rye Mutt
windows
2024-07-29Merge branch 'main' into 2024.06-atlasaurusErik Kundiman
2024-07-29Get VLC streaming to work again on macOSErik Kundiman
Somehow it wouldn't work when the libvlc dylibs linked by media_plugin_libvlc were far in Frameworks, even with all the linkages and VLC_PLUGIN_PATH set correctly. Because of this, I had to make the libvlc files redundantly copied (they're under 1 MB so we'll live with it) in llplugin just like upstream for media_plugin_libvlc to link to instead, though it seems the directory name can be anything, so I just let it be "plugins" for installation convenience using CMake. Also now the builder is assumed to not necessarily want VLC.app to be installed in /Applications, though they would need to keep the downloaded VLC disc image open.
2024-07-28Make system GLM foundErik Kundiman
I had to use find_package here directly because somehow our "different" use_system_binary wouldn't set glm_FOUND to true, even though CMake found the package.
2024-07-28Merge remote-tracking branch 'secondlife/release/2024.06-atlasaurus' into ↵Erik Kundiman
2024.06-atlasaurus
2024-07-21Add newer MSVC redist libs to copy action (#2075)Rye Mutt
2024-07-20Merge branch 'main' into webrtc-voiceErik Kundiman
2024-07-19Enable SSE2 instruction support in glm for optimized codegen (#2066)Rye Mutt
2024-07-09Merge branch 'main' into webrtc-voiceErik Kundiman
2024-07-09Merge branch 'main' into maint-bErik Kundiman
2024-07-09NDOF can be enabled for Space Navigator supportErik Kundiman
2024-07-08GLH and Mikktspace can be untarred in packages nowErik Kundiman
They're custom anyway so very unlikely to be reused in other projects. TinyGLTF.cmake changes here just to minimise diff, the include directory setting does not have any effect (just like in TinyEXR.cmake).
2024-07-07Not override CMAKE_OSX_ARCHITECTURES to one archErik Kundiman
Now you can pass -DCMAKE_OSX_ARCHITECTURES:STRING=`uname -m` or -DCMAKE_OSX_ARCHITECTURES:STRING="arm64;x86_64" and it will build as intended.
2024-07-06Merge branch 'main' into maint-bErik Kundiman
2024-07-05Merge branch 'main' into webrtc-voiceErik Kundiman
2024-07-05`make install` on macOS copies resources to bundleErik Kundiman
Except for SLPlugin since there's already a custom command for it.
2024-07-01#1111 Remove xmlrpc-epiAlexander Gavriliuk
2024-07-01Merge branch 'main' into maint-bErik Kundiman
2024-07-01Make it build for FBSD on SLv's Linux resurrectionErik Kundiman
2024-07-01ConfigurePkgConfig is not needed anymore after allErik Kundiman
FindPkgConfig does the work.
2024-06-27Prevent automatic download of WebRTCErik Kundiman
for when autobuild's not installed.
2024-06-27Merge remote-tracking branch 'secondlife/release/webrtc-voice' into webrtc-voiceErik Kundiman