summaryrefslogtreecommitdiff
path: root/indra/cmake
AgeCommit message (Collapse)Author
2023-10-29DRTVWR-589: Merge branch 'main' of viewer-private into DRTVWR-589Nat Goodspeed
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-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-09-05Initial prototype of embedded LUAMnikolenko Productengine
2023-08-31Fix CMake CMP0148 deprecation warning introduced with CMake 3.27.4Ansariel
2023-08-24Merge remote-tracking branch 'origin/main' into DRTVWR-489Andrey Kleshchev
# Conflicts: # indra/llcommon/llsdserialize.cpp # indra/llcommon/llsdserialize.h # indra/llmath/llvolume.cpp # indra/llrender/llgl.cpp # indra/llxml/llcontrol.cpp # indra/newview/llpanelnearbymedia.cpp # indra/newview/llsceneview.cpp # indra/newview/llselectmgr.cpp # indra/newview/llstartup.cpp # indra/newview/lltextureview.cpp # indra/newview/llvovolume.cpp # indra/newview/skins/default/xui/en/menu_viewer.xml
2023-07-18Merge remote-tracking branch 'origin/xcode-14.3' into DRTVWR-559 (#292)Brad Linden
2023-07-18Fixes for compatibility with new xcode 15 beta for any viewer branch after ↵Brad Linden
DRTVWR-577 (#232)
2023-06-28DRTVWR-582: Merge branch DRTVWR-582-maint-U into contribute-frozenNat Goodspeed
to resolve conflicts in installer_template.nsi
2023-06-07Fixes for compatibility with new xcode 15 beta for any viewer branch after ↵Brad Linden
DRTVWR-577 (#232)
2023-06-07Attempt to port some build.yaml improvements from DRTVWR-559 over to actions ↵Brad Linden
branch
2023-06-05SL-18837: Try to silence cascade of Boost.Bind warning messages.Nat Goodspeed
2023-06-05SL-18837: Windows APR 1.7.2 requires MS rpcrt4.dll.Nat Goodspeed
2023-06-05SL-18837: We no longer build Windows apr-iconv -- don't reference.Nat Goodspeed
With VS 2022 on Windows GitHub Actions runners, we can't build apr_suite at all with the upstream .sln / .vcxproj files, so we had to switch to "experimental" CMake support. However there's no CMakeLists.txt file for apr-iconv, so the Windows package omits that library.
2023-06-02SL-18837: Don't try to copy long, specific libnghttp2.14.19.0.dylib.Nat Goodspeed
The package doesn't include that any more.
2023-05-19DRTVWR-558: Merge branch 'main' of secondlife/viewer into actionsNat Goodspeed
2023-05-17Some small tweaks after merge with Viewer releaseCallum Prentice
2023-05-17Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2023-05-05DRTVWR-559: Hard tabs considered harmfulNat Goodspeed
2023-05-04Merge pull request #179 from secondlife/brad/mac-nightly-buildsBrad Linden
enable github actions mac nightly builds
2023-05-04Fix typoBrad Linden
2023-05-03Added ability to disable required OSX_SYSROOT cmake checksBrad Linden
2023-05-03Experiment with turning on MacOS builds for github based nightly builds for ↵Brad Linden
DRTVWR-559
2023-05-03DRTVWR-559: Replace debugLoggingEnabled() function with LL_DEBUGS().Nat Goodspeed
The trouble with debugLoggingEnabled() is that it locked mutexes and searched maps every time that call was reached. LL_DEBUGS() has the same functionality (albeit with idiosyncratic syntax) but performs expensive lookups only once per session, caching the result in a local static variable.
2023-05-02MErge with main after Viewer releaseCallum Prentice
2023-05-02Merge branch 'main' into DRTVWR-577-maint-SAndrey Lihatskiy
2023-05-02Merge branch 'main' into DRTVWR-582-maint-UAndrey Lihatskiy
2023-04-26Merge remote-tracking branch 'origin/DRTVWR-539' into DRTVWR-559-merge-539Brad Linden
2023-04-26DRTVWR-559 Disable unit tests by default.RunitaiLinden
2023-04-19SL-19623 Merge 'CMake' pull request #150 from Ansarielakleshchev
Fix CMake files related to ICU4C
2023-04-10SL-19078: changes to autobuild to unpack the emoji/shortcode 3p library and ↵Callum Prentice
then copy the XML files to the right place in the Viewer dev tree (indra/newview/skins/xui/*/emoji_characters.xml)
2023-04-10SL-18839: Add basic Github buildBennett Goble
2023-04-07Merge branch 'main' into marchcat/main-contrib-mergeAndrey Lihatskiy
# Conflicts: # indra/cmake/CMakeLists.txt # indra/llcommon/llsdserialize.cpp # indra/llcommon/llsdserialize.h # indra/llcommon/tests/llleap_test.cpp # indra/newview/llfilepicker.h # indra/newview/llfilepicker_mac.h # indra/newview/llfilepicker_mac.mm # indra/newview/skins/default/xui/en/strings.xml
2023-04-05SL-18839: Add basic Github buildBennett Goble
2023-04-04Fix CMake files related to ICU4CAnsariel
2023-04-03DRTVWR-489: Fix things up after a messy merge with main because of a ↵Callum Prentice
gigantic CMake patch. Sadly, my macOS box updated to Xcode14.3 overnight and that caused many warnings/errors with variables being initialized and then used but not in a way that affected anything.. Building on Xcode 14.3 also requires that MACOSX_DEPLOYMENT_TARGET be set to > 10.13. Waiting on a decision about that but checking this in in the meantime. Builds on macOS with appropriate build variables set for MACOSX_DEPLOYMENT_TARGET = 10.14 but not really expecting this to build in TC because (REDACTED). Windows version probably hopelessly broken - switching to that now.
2023-03-31Fix Tracy linking after recent DRTVWR-559/main mergeBrad Linden
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-30Merge branch 'main' into DRTVWR-577-maint-SAndrey Lihatskiy
# Conflicts: # indra/cmake/CMakeLists.txt # indra/newview/skins/default/xui/es/floater_tools.xml
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-02-10Updated tracy packages and config for tracy-v0.8.1 for SL-18563Brad Kittenbrink (Brad Linden)
2023-02-10Upgraded tracy package and enabled for mac with USE_TRACY for work on mac ↵Brad Linden
perfomance SL-18563 ``` autobuild installables edit "tracy" url="https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/110561/960415/tracy-v0.7.8.578230-darwin64-578230.tar.bz2" hash="70f31fa71ecb52bd092da52e27c3ff8c" autobuild installables edit "tracy" url="https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/110562/960424/tracy-v0.7.8.578230-windows-578230.tar.bz2" hash="1dc33422939adf015db85e96c5a8276e" autobuild installables edit "tracy" url="https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/110563/960429/tracy-v0.7.8.578230-windows64-578230.tar.bz2" hash="fcc6ecece2ecb65aa36500dfa9461fb3" ```
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-26 01:11:50 +0000