summaryrefslogtreecommitdiff
path: root/indra/cmake
AgeCommit message (Collapse)Author
2024-09-26ReindentErik Kundiman
2024-09-25Re-add pcre header directory for macOSErik Kundiman
I thought /opt/local/include wasn't needed since we switched to boost181, but PCRE headers are there. If you still have "boost" installed (maybe depended on by some other package, just deactivate it first before cmake).
2024-09-21ColladaDOM depends on dynamic Boost 1.81 on macOSErik Kundiman
so we don't need the boost package or the -no_static variant of boost181 any more.
2024-09-19LL's WebRTC breaks CEF on Ubuntu too, so use CM'sErik Kundiman
Now that it's only Debian and macOS x86-64 that are left safe to use LL's WebRTC build, the logic is reversed.
2024-09-17Merge branch 'main' into 2024.08-DeltaFPSErik Kundiman
2024-09-17Revert to LL's OpenJPEG forkErik Kundiman
System 2.5.2 caused too much rainbow in DeltaFPS. For now, the OpenJPEG listed in autobuild.xml is 2.5.0. However, LL has recently got 2.5.2 too in their OpenJPEG fork repo, but we switch to that once it's the one listed in autobuild.xml. Reverting to the now maintained LL 3p-openjpeg should fix the texture thrashing problem https://megapahit.com/show_bug.cgi?id=1 starting from DeltaFPS.
2024-09-16Merge branch 'main' into 2024.08-DeltaFPSErik Kundiman
2024-09-16WebRTC on Fedora & openSUSE without breaking CEFErik Kundiman
Thanks to the Linux x86-64 WebRTC binary from Zenichi Amano (crow-misia). https://megapahit.com/show_bug.cgi?id=64 Haven't been tested on openSUSE, but it should work.
2024-09-07Merge branch 'main' into 2024.08-DeltaFPSErik Kundiman
2024-09-01Merge remote-tracking branch 'secondlife/release/2024.08-DeltaFPS' into ↵Erik Kundiman
2024.08-DeltaFPS
2024-09-01Merge branch 'main' into freebsdHiroo Ono
2024-09-01Build and link collada-dom v2.3-r7 taken from Linden Lab's 3rd party softwareHiroo Ono
repository.
2024-09-01Build private static collada-dom library for Linux and FreeBSD.Hiroo Ono
Clone the repository by git and make it a cmake submodule.
2024-08-31Revert GNU/Linux to use system Collada DOM for nowErik Kundiman
2024-08-31Fix Error: Dae parsing issue on FreeBSDErik Kundiman
by managing to compile LL's ColladaDOM 2.3 on-the-fly.
2024-08-31Make sure webrtc gets emptied before refilling itErik Kundiman
on macOS arm64, the header directory.
2024-08-31Make sure ColladaDOM gets built nowErik Kundiman
Spaces are really just troublesome in argument passing. They can't really be escaped, quoting from -D would even replace spaces with semicolons. Hence making use of every variable that can be used in Collada DOM's CMakeLists.txt.
2024-08-31Revert "macOS uses prebuilt Collada DOM binaries"Erik Kundiman
This reverts commit 3bba39cf3e4d56da5aba883479539ed89fa578b9.
2024-08-31macOS uses prebuilt Collada DOM binariesErik Kundiman
2024-08-31Fix logics in deciding to build ColladaDOM or notErik Kundiman
So that colladadom_installed won't throw USESYSTEMLIBS to the next scope. Also libpcrecpp_LIBRARIES doesn't take spaces (might work by escaping the quotes, but only 1 pcrecpp needed anyway).
2024-08-31Revert Linux/BSD to use system Collada DOM for nowErik Kundiman
Turns out getting 2.3 compiled on those platforms need a lot more attention. Apart from that, the compilation result variable name got fixed, the prebuilt include directory got fixed, and pkg-config-ing minizip, libpcrecpp and libxml-2.0 so we can make have generic variable arguments to pass to Collada DOM's CMake settings.
2024-08-30Fix Error: Dae parsing issue - see log for detailsErik Kundiman
https://megapahit.com/show_bug.cgi?id=76 It seems like we have to use LL's Collada DOM 2.3. Make sure minizip is installed on macOS. It should be safe to uninstall your system Collada DOM package now. The CMake arguments might have to be completed for non-Darwin platforms in a next commit.
2024-08-28Fix left out & error-causing from previous commitErik Kundiman
2024-08-28Disable WebRTC on Fedora and openSUSE TumbleweedErik Kundiman
It breaks CEF on these platforms.
2024-08-28Fix WebRTC include dirs extracted to wrong pathErik Kundiman
for macOS arm64.
2024-08-28Fix order of checking lib64 & lib/x86_64-linux-gnuErik Kundiman
Ubuntu, unlike Debian, has /lib64 and /usr/lib64 in their system, so it misled CMake. This is a quick fix, ideally it's the distro name that is checked.
2024-08-25Merge branch 'main' into 2024.06-atlasaurusErik Kundiman
2024-08-25Darwin prebuilt OpenSSL binaryErik Kundiman
2024-08-25Fix macOS architecture comparison operatorErik Kundiman
cause they're not like 0 valued ${_binary}_installed that it would run lipo -thin on already thinned binaries.
2024-08-25Darwin prebuilt libcurl binaryErik Kundiman
2024-08-25Darwin & Tumbleweed use prebuilt XMLRPC-EPIErik Kundiman
Refer to this commit if you need to recover the steps in compiling XMLRPC-EPI. The prebuilt binary for Darwin is distributed as universal, and will be thinned accordingly. It also makes use of autobuild.xml, but only partially (the sha1sum isn't used yet in the Prebuilt.cmake reimplementation).
2024-08-25use_prebuilt_binary(nanosvg) uses reimplementationErik Kundiman
also to minimise ViewerMisc.cmake diff from upstream.
2024-08-25Make Prebuilt.cmake reimplementation more genericErik Kundiman
Anticipate the possibility that an archive isn't suffixed with a 64. Parentheses need to be escaped by quotes (backslashing would work too), otherwise they would be parsed as part of CMake commands syntax. Regex subexpressions shouldn't contain regex themselves (only verbatim or preprocessed strings are used within the parentheses).
2024-08-21Remove the right old WebRTC FrameworkErik Kundiman
2024-08-20#2354 Enable Tracy on test builds (#2357)Dave Parks
* #2354 Enable Tracy on test builds * Only enable Tracy by default on windows
2024-08-19Merge branch 'webrtc-voice' into 2024.06-atlasaurusErik Kundiman
2024-08-19Merge remote-tracking branch 'secondlife/release/2024.06-atlasaurus' into ↵Erik Kundiman
2024.06-atlasaurus
2024-08-19Merge branch 'main' into webrtc-voiceErik Kundiman
2024-08-19Make sure curl doesn't get configured with libssh2Erik Kundiman
Turns out it was on by default, probably that's why it would fail on everyone else's systems, building libcurl, cause in the log I saw libssh2 was requiring the very openssl3 we have to deactivate until libcurl compilation is done.
2024-08-18openSUSE Tumbleweed supportErik Kundiman
Its own CPACK_RPM_PACKAGE_REQUIRES will catch up soon.
2024-08-16Remove pointless CMake status message (#2322)Ansariel Hiller
2024-08-16WebRTC versioning starts with an 'm', not a 'v'Erik Kundiman
2024-08-16Merge branch 'main' into webrtc-voiceErik Kundiman
2024-08-16Fix meshoptimizer & NDOF tracking contains garbageErik Kundiman
instead of 0.
2024-08-16LL's prebuilt files are saved in build directoryErik Kundiman
in their original names.
2024-08-15Remove old arm64 WebRTC.framework before copyingErik Kundiman
Still triggered by upstream autobuild.xml even though there is actually no need to update on macOS arm64's side.
2024-08-15Merge branch 'main' into webrtc-voiceErik Kundiman
2024-08-15Make sure OpenSSL is built before CURLErik Kundiman
LLCoreHttp.cmake is included earlier (by llappearance/CMakeLists.txt), before llcorehttp/CMakeLists.txt (even though it includes LLCoreHttp.cmake in return).
2024-08-15Make packages/lib/release directory automaticallyErik Kundiman
cause it's needed at least on macOS, where the command to install the FMOD (which is the one done earliest) library is execute_process(COMMAND lipo), and not file(COPY) that would imply a mkdir.
2024-08-14Enable /permissive- on MSVC for better standards conformance (#2251)Rye Mutt
* Enable /permissive- on MSVC for better C++ conformance and fix related errors * Clean up left over warning suppressions from old library or msvc versions