summaryrefslogtreecommitdiff
path: root/indra/CMakeLists.txt
AgeCommit message (Collapse)Author
2023-05-12SL-18837: Remove C++17 override, given build-variables change.Nat Goodspeed
Until now, the viewer has explicitly set(CMAKE_CXX_STANDARD 17) with a comment explaining that we hadn't dared add -std=c++17 to build-variables/variables because we didn't know if we could build all the component autobuild packages with that switch. Now that we've successfully built all of them with that switch, we've updated the viewer branch of build-variables, so we can remove the viewer's CMAKE_CXX_STANDARD override.
2022-09-17SL-17238 Fix coding policy build issuesAndrey Kleshchev
2022-09-17Workaround to keep old cmake versions limping around.Nicky
2022-09-16Settings the startup project must come *after* add_subdirectory(newview). ↵Nicky Dasmijn
Only after this directory is added the target will be known and can be manipulated.
2022-09-16Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into ↵Nicky Dasmijn
DRTVWR-568_cmake
2022-08-30DRTVWR-568 need to update cmake minimumBrad Kittenbrink
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-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-04-19Finishing touches, making sure even with conan all needed 3ps are installed ↵Nicky
and usable. This brings the source to be able to run tests in conan mode.
2022-04-18Round one to support conan for 3P packages, this allows to build the viewer ↵Nicky
on Linux again.
2022-04-18Remove obsolete targets and dependencies.Nicky
2022-04-16Request C++ standard via standard cmake.Nicky
2022-04-16Now there is a oslibrary target get rid of some more obsolete vars:Nicky
LEGACY_STDIO_LIBS (was only used for Windows) PTHREAD_LIBRARY (only Linux) LLDATABASE_LIBRARIES (that one was supposed for Linux, but never needed anyway)
2022-04-09Bump cmake version needed up to 3.16 so target_precompile_headers can beNicky
used.
2022-04-09Raise the bar to cmake 3.13, this gives access to more modernNicky
constructs.
2021-12-26Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
2021-12-15DRTVWR-546 merge up to 6.5.2Dave Houlton
2021-10-22Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/CMakeLists.txt # indra/llcommon/CMakeLists.txt # indra/newview/CMakeLists.txt # indra/newview/llappviewerwin32.h
2021-10-13Merge with master after latest Viewer releaseCallum Linden
2021-10-14Merge branch master (DRTVWR-520) into DRTVWR-542-meshoptAndrey Kleshchev
2021-09-27DRTVWR-543: Fix local Mac builds with BugSplat. (Thanks NickyD!)Nat Goodspeed
With the affected line, local Mac builds with BugSplat enabled fail. Without it, they build clean.
2021-09-09SL-14541 remove mac-crash-loggerAndrey Kleshchev
2021-09-08SL-14541 removed breakpad, win_crash_loggerAndrey Kleshchev
# Conflicts: # autobuild.xml # indra/CMakeLists.txt # indra/newview/CMakeLists.txt # indra/newview/llappviewerwin32.h # indra/win_crash_logger/llcrashloggerwindows.cpp Cherry picked from DRTVWR-520
2021-08-12Merge branch 'master' into DRTVWR-520-apple-notarizationAndrey Lihatskiy
# Conflicts: # autobuild.xml # build.sh # indra/CMakeLists.txt # indra/newview/CMakeLists.txt # indra/newview/llappviewermacosx.cpp # indra/newview/llappviewerwin32.h # indra/newview/viewer_manifest.py # indra/win_crash_logger/llcrashloggerwindows.cpp
2021-07-20Merge master (DRTVWR-516) into DRTVWR-542-meshoptAndrey Kleshchev
2021-07-19Merge with tip of Master after a Viewer releaseCallum Prentice
2021-07-07SL-15522 Initial addition of meshoptimizerAndrey Kleshchev
2021-04-26SL-15170 remove mac_crash_loggerMnikolenko ProductEngine
2021-03-17SL-14541 removed breakpad, win_crash_logger, updated zlibAndrey Kleshchev
2021-03-09This set of changes reverts the merge with master (git revert c83e740) and ↵Callum Prentice
results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal
2021-03-08Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into ↵Brad Payne (Vir Linden)
DRTVWR-519" This reverts commit e61f485a04dc8c8ac6bcf6a24848359092884d14, reversing changes made to 00c47d079f7e958e473ed4083a7f7691fa02dcd5.
2020-09-17The folder where the disk cache lives was originally renamed from llvfs to ↵Callum Prentice
llcache but @henri's suggestion that that doesn't reflect the other files in the same place and it should be llfilesystem is a good one so I changed it over
2020-09-16First part of change to remove LLVFS from the Viewer. Consists of code ↵Callum Prentice
changes to remove LLVFS and LLVFSThread classes along with the associated source files. The existing llvfs folder is renamed to llcache. Also includes changes to CMake script in many places to reflect changes. Eventually, llvfile source file and class will be renamed but that is not in this change.
2020-08-24SL-10297 merged 6.4.7Oz Linden
2020-03-25[DRTVWR-476] - fix linkingAnchor
2019-10-07do not build the old crash logger when using bugsplatOz Linden
2019-06-06remove the old crash logger modules when using BugSplatOz Linden
2019-03-02convert to an explicit USE_BUGSPLAT switch in cmake, revise LL_ERRS approachOz Linden
2019-03-19Better VS studio supportandreykproductengine
2018-09-07remove only-partially-successful attempt to put teamcity blocks around targetsOz Linden
2018-09-05add more block structure to TeamCity log output for componentsOz Linden
2017-07-10MAINT-4532: properly detect Windows 10 in the 64bit build (only - 32bit runs ↵Oz Linden
in Windows 8 compatibility mode)
2017-04-10MAINT-6928: Add in Python 2.6.6 modulesGlenn Glazer
2016-08-18SL-323: first pass at ripping out old updaterGlenn Glazer
2016-02-07merge changes for OPEN-292Oz Linden
2016-01-15merge changes for 4.0.1-releaseOz Linden
2015-11-10remove execute permission from many files that should not have itOz Linden
2015-10-02MAINT-5687: Remove old webkit from the make files and the repo. Ensure that ↵Rider Linden
it is no longer meaningfully referenced.
2015-07-10move doxygen generation to a subdirectoryOz Linden
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 23:00:10 +0000