summaryrefslogtreecommitdiff
path: root/indra/cmake
AgeCommit message (Collapse)Author
2022-12-12Merge branch 'xcode-14.1' into contributeAndrey Kleshchev
2022-11-21Update message template URL after move to GitHubAnsariel
2022-11-16Merge branch 'DRTVWR-489-emoji' into DRTVWR-489-emojiKitty Barnett
2022-11-09Merge branch contribution/emoji into DRTVWR-489-emojiKitty Barnett
2022-11-06Add support for OT-SVG fontsKitty Barnett
2022-11-03DRTVWR-575: Suppress remaining size_t truncation warnings for now.Nat Goodspeed
2022-11-03DRTVWR-575: Forbid Xcode 14.1 from implicitly signing every target.Nat Goodspeed
Or rather, attempting to implicitly sign. On TeamCity we must explicitly sign using viewer_manifest.py. On a developer system, without these changes, Xcode produces many errors of the form: error: An empty identity is not valid when signing a binary for the product type 'Command-line Tool'. (in target 'INTEGRATION_TEST_lldir' from project 'SecondLife') and refuses to compile anything at all. Thanks to Rye Mutt and NickyD. Also thanks Geir Nøklebye for additional settings to help tame Xcode 14.1 warnings.
2022-10-25Bump Teamcity for new Project Viewer build of DRTVWR-559Brad Kittenbrink
2022-10-23Revert "SL-18390: speculative fix for broken notarization - part2"Nicky
This reverts commit 31917709d9f4d9d4742910ae7990009a1580b150.
2022-10-21SL-18390: speculative fix for broken notarization - part2Callum Prentice
2022-10-12Run on windows-2022-largeSignal Linden
2022-10-04SL-16542 Openjpeg's header should have remained unchanged.Andrey Kleshchev
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-17238 Small cleanupAndrey Kleshchev
Implied 'branch' is now two different version-control systems behind
2022-09-21SL-17238 Merged in NickyD's cmake changesNicky Dasmijn
2022-09-20DRTVWR-568: Stop suppressing unused variable warnings -- we fixed?!Nat Goodspeed
2022-09-17Merge test cleanup.Nicky Dasmijn
2022-09-17SL-17238 MacOS build does not recognize no-unused-but-set-variableAndrey Kleshchev
2022-09-17SL-17238 Fix coding policy build issuesAndrey Kleshchev
2022-09-17MacOs packaging is weird, as Nat already did point out :(Nicky Dasmijn
Part of his change was omly taking Release builds into account, the other part from me made the same mistake. Use a generator expression with a custom command to get the symlink the way we want.
2022-09-17Cleanup sweepNicky Dasmijn
2022-09-17Only set include property on ll::bugpsplat target when on Windows.Nicky Dasmijn
The include was preveiously declared for all platforms, but the Mac package does not even ship this include directory. With the new way cmake works this will lead to an error (which is good, so we don't end with bogus include dirs).
2022-09-17Workaround to keep old cmake versions limping around.Nicky
2022-09-17Try to make sure this also works with the havok version of llphysicsextension.Nicky Dasmijn
2022-09-16Rename MESHOPTIMIZER.cmake to Meshoptimizer.cmake as those caps honestly bug me.Nicky Dasmijn
2022-09-16Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into ↵Nicky Dasmijn
DRTVWR-568_cmake
2022-09-12SL-18095 WIP -- Use meshoptimizer to re-weld and cache optimize after ↵Dave Parks
generating tangents
2022-09-08SL-18095 Add missing Mikktspace.cmakeDave Parks
2022-09-08SL-18095 WIP -- Add Mikktspace tangent generation for PBR materials and ↵Dave Parks
switch to per-pixel binormal generation. Still bugged with some test content.
2022-09-01SL-17657: Merge branch 'more-c++17' into DRTVWR-568.Nat Goodspeed
Converting on DRTVWR-568 as the project branch going forward.
2022-09-01DRTVWR-568: Ensure parent directory exists before CREATE_LINK.Nat Goodspeed
2022-08-30DRTVWR-568: Pull in new 3p-colladadom build, tweak to VSVER number hardcoded ↵Callum Linden
into autobuild.xml for VS 2022 and update cmake script to copy the MSVC runtime (proper fix coming
2022-08-28Merge branch 'contribution/emoji'Kitty Barnett
2022-08-26DRTVWR-568: More cleanup of deleted obsolete std library features.Nat Goodspeed
2022-08-23DRTVWR-558: Streamline and generalize Windows Python search.Nat Goodspeed
2022-08-22DRTVWR-558: Fix builds on macOS 12.5 Monterey.Nat Goodspeed
Always search for python3[.exe] instead of plain 'python'. macOS Monterey no longer bundles Python 2 at all. Explicitly make PYTHON_EXECUTABLE a cached value so if the user edits it in CMakeCache.txt, it won't be overwritten by indra/cmake/Python.cmake. Do NOT set DYLD_LIBRARY_PATH for test executables! That has Bad Effects, as discussed in https://stackoverflow.com/q/73418423/5533635. Instead, create symlinks from build-mumble/sharedlibs/Resources -> Release/Resources and from build-mumble/test/Resources -> ../sharedlibs/Release/Resources. For test executables in sharedlibs/RelWithDebInfo and test/RelWithDebInfo, this supports our dylibs' baked-in load path @executable_path/../Resources. That load path assumes running in a standard app bundle (which the viewer in fact does), but we've been avoiding creating an app bundle for every test program. These symlinks allow us to continue doing that while avoiding DYLD_LIBRARY_PATH. Add indra/llcommon/apply.h. The LL::apply() function and its wrapper macro VAPPLY were very useful in diagnosing the problem. Tweak llleap_test.cpp. This source was modified extensively for diagnostic purposes; these are the small improvements that remain.
2022-07-17Be more explicit: Rename use_conan_binary to use_system_binary, this will ↵Nicky
allow us to reuse the macro for more than just conan.
2022-06-29Merge branch 'master' (DRTVWR-543) into DRTVWR-559Andrey Kleshchev
# Conflicts: # autobuild.xml # indra/llrender/llgl.cpp # indra/newview/CMakeLists.txt # indra/newview/llvovolume.cpp
2022-06-23fixing DRTVWR-559 glext usage on mac by upgrading to use khronos distributed ↵Brad Kittenbrink
glext.h
2022-06-21SL-17600 WIP -- Proper radiance maps (not just mipped cubemaps).Dave Parks
2022-06-08SL-17214 add 3p-tinygltf dependency to autobuild.xmlDave Houlton
2022-06-05Port new cmake files (Trace/Meshoptimizer) to modern cmakeNicky
2022-06-05Bring back comments for EXTERNAL_TOS and LL_IGNORE_SIGCHLDNicky
2022-06-05Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into ↵Nicky
DRTVWR-543-maint_cmake
2022-05-27Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/cmake/LLCommon.cmake # indra/llcommon/CMakeLists.txt # indra/llrender/llgl.cpp # indra/newview/llappviewer.cpp # indra/newview/llface.cpp # indra/newview/llflexibleobject.cpp # indra/newview/llvovolume.cpp
2022-05-20SL-17287 Update Tracy to 0.8.1. Clean up GPU instrumentation.Dave Parks
2022-05-09SL-17376 Fix viewer failing due to missing vcruntime140_1Andrey Kleshchev
2022-05-07Remove unused LL_ARCH/LL_ARCH_DIRNicky
2022-05-07ADDRESS_SIZE auto detection was broken with python3, fix this.Nicky
- Simplify detection by using regex - OSX is always 64 bit
2022-05-07Cache ENV{LL_BUILD} to LL_BUILD_ENV:Nicky
- ENV{LL_BUILD} takes precedence - if ENV{LL_BUILD} is not set but LL_BUILD-ENV is, set ENV{LL_BUILD} to the cached version - error if none of the two is set Caching the variable and reusing it lets cmake run when not called by autobuild itself. This happens when xcode or visual studio detect it needs to be re rerun and call it for the "cmake" target. Not having LL_BUILD then makes those targets fail.
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 00:08:39 +0000