summaryrefslogtreecommitdiff
path: root/indra/cmake
AgeCommit message (Collapse)Author
2023-12-23Rely on prebuilt OpenJPEG headersErik Kundiman
so we follow its encapsulating directory naming. Looks like we're still going to be using LL's 3p-openjpeg for a while more.
2023-12-18Unix install sets plugin dir to system library dirErik Kundiman
because (at least) the vlc/plugins dirs are inside it in the same way it's been inside llplugin. This is so the app can find system VLC plugins. And for this, BUILD_SHARED_LIBS set on must work first on Linux (has already been working on FreeBSD), since libmedia_plugin_libvlc is a shared library (which now gets installed to system library dir too, on both OSes).
2023-12-17Revert "EXTERNAL_TOS on macOS too, for now"Erik Kundiman
This reverts commit 33691f2fa52e3b9c2146391413234472769b13ed.
2023-12-15Merge tag '7.1.1-release'Erik Kundiman
source for viewer 7.1.1.7039128750
2023-12-14macOS internal web browserErik Kundiman
Just untar Dullahan package manually in prebuilt libs dir.
2023-12-06The VLC used on macOS is the one in /ApplicationsErik Kundiman
2023-11-29Merge branch 'DRTVWR-559' into marchcat/587-v-pbr-mergeAndrey Lihatskiy
# Conflicts: # indra/llcommon/CMakeLists.txt # indra/newview/llspatialpartition.cpp # indra/newview/llviewergenericmessage.cpp # indra/newview/llvoavatar.cpp
2023-11-07Merge branch 'main' into DRTVWR-559Erik Kundiman
2023-11-07EXTERNAL_TOS on macOS too, for nowErik Kundiman
since we don't have any web browser there either.
2023-10-30Revert "DRTVWR-587 Bring back the previously reverted change"Andrey Lihatskiy
This reverts commit 9d49edbc48d81f820870d43edb2c975beffa5485.
2023-10-30DRTVWR-587 Bring back the previously reverted changeAndrey Lihatskiy
2023-10-26Merge remote-tracking branch 'secondlife/DRTVWR-559' into DRTVWR-559Erik Kundiman
2023-10-26Merge tag '6.6.16-release'Erik Kundiman
source for viewer 6.6.16.6566955269
2023-10-25Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2023-10-26D587 Post merge fmod issues fixAndrey Kleshchev
2023-10-25Merge branch 'main' into DRTVWR-587-maint-VAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/llcommon/tests/llleap_test.cpp # indra/newview/viewer_manifest.py
2023-10-12Merge pull request #427 from secondlife/signal/py312nat-goodspeed
Add python 3.12 to FindPython search path
2023-10-08Add python 3.12 to FindPython search pathBennett Goble
Look for python 3.12 in the registry along with all the other versions.
2023-10-04Revert "DRTVWR-587: Simplify Python.cmake by omitting find_package(Python3)."Andrey Lihatskiy
2023-09-10TinyGLTF & Vulkan glTF not included on systemlibsErik Kundiman
Vulkan glTF doesn't seem to be used yet. TINYGLTF_INCLUDE_DIR doesn't seem to be used yet either. Tiny GLTF can be headers only, easy to install to system.
2023-09-10Merge branch 'main' into DRTVWR-559Erik Kundiman
2023-09-10Use prebuilt OpenJPEG for nowErik Kundiman
until we figure out what's causing crashes with vanilla OpenJPEG.
2023-09-08DRTVWR-587: Adopt Ansariel's Python.cmake Windows simplification.Nat Goodspeed
2023-09-07SL-18837: Merge branch 'main' into actionsNat Goodspeed
2023-09-05DRTVWR-587: Simplify Python.cmake by omitting find_package(Python3).Nat Goodspeed
Elsewhere in CMake land, we reference PYTHONINTERP_FOUND and PYTHON_EXECUTABLE, both of which are explicitly set by Python.cmake. We don't seem to need the find_package(Python3 COMPONENTS Interpreter) call. Given that we take some pains to be careful about which Windows Python interpreter we find, this eliminates a wildcard.
2023-08-31Fix CMake CMP0148 deprecation warning introduced with CMake 3.27.4Ansariel
2023-08-27Hidden visibility only when building static libsErik Kundiman
Otherwise it would fail to link SLPlugin.
2023-08-27Force FreeBSD to accept TOS via external browserErik Kundiman
This forces the use of external browser for links too for now, as we don't have a solution for the HTML media plugin yet.
2023-08-26Don't install the libraries when they're staticErik Kundiman
For runtime, they're already part of the executable. For development, we're not there yet. So this reduces the overall package size for now.
2023-08-26Don't install the headers for nowErik Kundiman
until we've tried building another project, but based on this project's liblinden. It's also because these headers would be in a separate -dev Debian package.
2023-08-26CPack for packaging (when PACKAGE set to on)Erik Kundiman
Since we could use the dynamic versioning from the configuration phase of CMake, the inclusion is put in BuildVersion.cmake. Other CPACK variables are usually static so can be set when running cmake. CPack somehow doesn't pick up the DESTINATION values in ViewerInstall (slplugin & libvlc too) from UnixInstall, so they're they're partially hardcoded again there.
2023-08-26Add sysroot to GLH & Meshoptimizer include pathsErik Kundiman
When cross-compiling, the host's /usr/local/include would be unsafely included before. The problem with this was that it leaked other host library headers unexpectedly, like Boost. The target compilation caught some function from the host headers which of a newer version, and then when trying to link to the target libraries, the function wasn't available yet in the older version.
2023-08-24Merge tag '6.6.14-release'Erik Kundiman
source for viewer 6.6.14.581101
2023-08-22ReindentedErik Kundiman
2023-08-22Fix target_link_directories argumentErik Kundiman
Only found out after using CMake 3.26 for Darwin. It wasn't an error when using CMake 3.24.
2023-08-22Add sysroot to XMLRPC-EPI include path on LinuxErik Kundiman
Useful when cross compiling.
2023-08-21Darwin & any platform can, and should, use SDLErik Kundiman
The alt mouse click to cam is broken for now on macOS, but this is the path we've chosen.
2023-08-16Revert "Try not to rely (explicitly) on X11"Erik Kundiman
This reverts commit d883a11567252d9a0baff653bb16c38817a7c21c.
2023-08-16Try not to rely (explicitly) on X11Erik Kundiman
2023-08-15SDL 1.2 to 2.0 migrationErik Kundiman
Both keycodes and scancodes are now 32 bits, so the key type is lengthened from U16 to U32.
2023-07-30SLPlugin is in libexec when installed to systemErik Kundiman
2023-07-29Add system XMLRPC-EPI include directory for DarwinErik Kundiman
2023-07-29Darwin escapes prebuilt dir inclusion on sys libsErik Kundiman
2023-07-29Fix CMAKE_PREFIX_PATH setting syntax for DarwinErik Kundiman
2023-07-29Viewer & resources can be installed on the systemErik Kundiman
2023-07-29The Linden libraries can be installed nowErik Kundiman
Useful when installed as shared libraries, so other viewer executables can share these libraries.
2023-07-29Start adding LibVLC support when using system libsErik Kundiman
Streaming is not working yet, though. Until it's made sure that the dynamic library and plugins needed are on the paths the executable is expecting them to be.
2023-07-19Obtain Vorbis & Ogg flags when using system libsErik Kundiman
On some platforms, pkg-config --libs vorbis might not necessarily imply -logg. vorbisenc & vorbisfile need their own checks anyway.
2023-07-19Mac frameworks not linked for "the remaining" OSesErik Kundiman
2023-07-19Use system SDL on FreeBSD tooErik Kundiman
X11 is still required too, that's why it's still added for linking. On Darwin, SDL is disabled for now.