summaryrefslogtreecommitdiff
path: root/indra/newview/CMakeLists.txt
AgeCommit message (Collapse)Author
2023-09-10Merge branch 'main' into DRTVWR-559Erik Kundiman
2023-09-10macOS still uses viewer_manifest for nowErik Kundiman
until we're ready with CPack for it.
2023-08-28Replace SL & Linden brands on macOSErik Kundiman
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-21SL-20145 New inventory feature notificationAndrey Kleshchev
Pulled in relevant parts from SL-19929
2023-08-21Apple Clang doesn't recognise --as-neededErik Kundiman
2023-08-21DBus hasn't been enabled, so why compile api_dbusErik Kundiman
So it won't get in the way for other platforms that have no DBus.
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-21Any platform can, & should, use appviewerlinux tooErik Kundiman
It's the one that plays along with SDL.
2023-08-21Revert "FreeBSD can use llappviewerlinux too"Erik Kundiman
This reverts commit 8356386f6674cf7f1e25bcd49f3266868cd5dc7d.
2023-08-07Make GCC not treat uninit-ed FetchEntry as errorErik Kundiman
2023-07-29Viewer & resources can be installed on the systemErik Kundiman
2023-07-29stringop truncation warnings aren't errors on GCCErik Kundiman
2023-07-29So we don't get errors from uninitialised varsErik Kundiman
when compiling newview using GCC.
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-29Revert "VLC & CEF aren't deps when no media plugins on mac"Erik Kundiman
This reverts commit f4c8949ac66d08263845f60a7cef2ecb9c77079b.
2023-07-19No dangling gsl warning on newview with ClangErik Kundiman
2023-07-19FreeBSD can use llappviewerlinux tooErik Kundiman
2023-07-19Disable packages info when using system librariesErik Kundiman
For now. Maybe.
2023-07-19VLC & CEF aren't deps when no media plugins on macErik Kundiman
2023-07-19Disable viewer manager when using system libsErik Kundiman
2023-07-19Disable LLCA when using system libs for nowErik Kundiman
2023-07-19Disable DBusGlib when using system libsErik Kundiman
It's deprecated anyway.
2023-07-19Disable JS packages when using system libs for nowErik Kundiman
2023-07-19LL physics extensions stubErik Kundiman
Since the CMakeLists.txt includes some same .cmake files as the viewer, I think the project might as well be a part of the Linden libraries code. And for now is put under llprimitive (might not be consistent, in fact the opposite, with they way llplugin relates to slplugin), but I think this way results the least change, and it still works. The differences include: - all files (common llphysicsextensions headers to be included by library users and the stub implementation files) are put inside one directory, and the CMakeLists.txt is adjusted accordingly; - modernised CMakeLists.txt, so include_directories are now implied by target_link_libraries; - some file name fix; - add_library is not explicitly set to STATIC;
2023-04-26Merge remote-tracking branch 'origin/DRTVWR-539' into DRTVWR-559-merge-539Brad Linden
2023-04-03SL-18458 Followup -- disable vocache unit test to unstick build, sanitize ↵Dave Parks
"object_id" to "local_id"
2023-03-30CMake and tests fixups after merge with main for DRTVWR-559Brad Linden
2023-03-29Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2023-03-20Merge branch 'DRTVWR-568' into DRTVWR-573-maint-RAndrey Lihatskiy
# Conflicts: # indra/cmake/Copy3rdPartyLibs.cmake # indra/cmake/FindOpenJPEG.cmake # indra/cmake/OpenJPEG.cmake # indra/integration_tests/llui_libtest/CMakeLists.txt # indra/newview/CMakeLists.txt
2023-03-13Partial solution for SL-18458 Materials override cache not working and ↵Brad Linden
related SL-18684/SL-19206/SL-19173
2023-02-03SL-19148 Decruft some forward shaders and drawpools. Fix HUDs being in ↵Dave Parks
wrong color space.
2023-02-03Merge branch 'main' into DRTVWR-539Mnikolenko Productengine
# Conflicts: # doc/contributions.txt # indra/cmake/Copy3rdPartyLibs.cmake # indra/cmake/FindOpenJPEG.cmake # indra/cmake/OpenJPEG.cmake # indra/integration_tests/llui_libtest/CMakeLists.txt # indra/newview/CMakeLists.txt
2023-02-02Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2022-12-13Merge branch 'main' into DRTVWR-539Mnikolenko Productengine
# Conflicts: # doc/contributions.txt # indra/newview/llappviewer.cpp # indra/newview/skins/default/colors.xml
2022-12-12Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2022-12-12Merge branch 'main' into DRTVWR-568Callum Prentice
2022-12-12Merge branch 'main' into DRTVWR-570-maint-QAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/app_settings/shaders/class1/deferred/materialF.glsl # indra/newview/llfloater360capture.cpp
2022-11-22Merge branch 'DRTVWR-568' into DRTVWR-539Mnikolenko Productengine
2022-10-19SL-18391 Basic GLTF lifetime managementAndrey Kleshchev
2022-10-12SL-18190 Remove water reflection detail combo box and reimplement ↵Dave Parks
"Transparent Water" checkbox.
2022-10-04SL-18293, SL-18190 -- Fix for debug displays not showing up (wireframe still ↵Dave Parks
busted). WIP on reflection probe/PBR driven water shader.
2022-10-01SL-16542 Pull in chunks of graham's openjpeg code, update openjpeg and ↵Andrey Kleshchev
enable partial bitstreams Openjpeg was modified: "p_max_len -= l_nb_bytes_read;" was causing an overflow. I'm not sure if I did something incorectly in opj_skip/opj_seek viewer side, but seems like openjpeg should have been checking remaining space in p_max_len either way. P.S. Many thanks to Chafey and Neopallium for implementing openjpeg's partial bitstream support
2022-09-21SL-18202 WIP merging autotune contribution and updating UIMnikolenko Productengine
2022-09-21Merge branch 'master' into DRTVWR-539Mnikolenko Productengine
2022-09-17Remove some leftovers of the old precompiled headers usage. Pointed out by ↵Nicky Dasmijn
Ansariel Hiller.
2022-09-17Merge test cleanup.Nicky Dasmijn
2022-09-17SL-17238 Supress errors from physicsextensionsAndrey Kleshchev
2022-09-17Cleanup sweepNicky Dasmijn
2022-09-17cmake playing jedi mind tricks on me and making me missNicky
one genex that needed changing. Interstingly add_custom_target will not complain about a file that would never be declared as OUTPUT and thus is not really a valid cmake build target.``
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 21:34:49 +0000