summaryrefslogtreecommitdiff
path: root/indra/cmake
AgeCommit message (Expand)Author
2021-10-13Merge branch 'master' into DRTVWR-528Dave Houlton
2021-08-12Merge branch 'master' into DRTVWR-520-apple-notarizationAndrey Lihatskiy
2021-07-19Merge branch 'master' v 6.4.22 into DRTVWR-528Dave Houlton
2021-06-24SL-10297 windows local build fixAndrey Kleshchev
2021-05-27SL-15211 Update OpenSSL libraryAndrey Kleshchev
2021-05-12SL-10297: Revert "Need VS switch /std:c++17 to use std::string_view."Nat Goodspeed
2021-05-12SL-10297: Need VS switch /std:c++17 to use std::string_view.Nat Goodspeed
2021-05-12SL-10297: Merge branch 'sl-10297-oz' into sl-10297.Nat Goodspeed
2021-04-30Merge branch 'master' into DRTVWR-520-apple-notarizationAndrey Lihatskiy
2021-04-29DRTVWR-528 merge up to 6.4.19Dave Houlton
2021-04-15DRTVWR-528 clean up cmake recursive CXX_FLAGS definition (/Zo)Dave Houlton
2021-04-09Xcode12 linking fix (CEF)Andrey Lihatskiy
2021-03-17SL-14541 follow-up xcode buildfixAndrey Lihatskiy
2021-03-17SL-14541 removed breakpad, win_crash_logger, updated zlibAndrey Kleshchev
2021-03-09Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2021-03-08Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into ...Brad Payne (Vir Linden)
2021-03-02Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2021-01-16SL-14597 Fixed mac library only including symlinkAndrey Kleshchev
2021-01-16SL-14597 Updated Mac library nameAndrey Kleshchev
2021-01-16SL-14597 Pulled in updated uriparserAndrey Kleshchev
2020-10-06Remove SQLite from project and we are now not going to use it for the cacheCallum Prentice
2020-09-28Merge with tip of ReleaseCallum Prentice
2020-09-22Add SQLite third package to this viewer and pull in the most recent build (3.33)Callum Prentice
2020-09-22Merge branch 'master' v6.4.9 into DRTVWR-497Dave Houlton
2020-09-22Merge branch 'master' into DRTVWR-519Callum Prentice
2020-09-17The folder where the disk cache lives was originally renamed from llvfs to ll...Callum Prentice
2020-09-16First part of change to remove LLVFS from the Viewer. Consists of code change...Callum Prentice
2020-09-11Effective rename of DRTVWR-506-simple since there is no way to rename a branc...Callum Prentice
2020-08-24DRTVWR-497 restore parallel builds for x64 VS2017Dave Houlton
2020-08-24SL-10297 merged 6.4.7Oz Linden
2020-08-21Small change to CMake options to only enable the PreferredToolArchitecture=x6...Callum Prentice
2020-08-11Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
2020-07-22Mac buildfixAndrey Lihatskiy
2020-06-26DRTVWR-476: On Windows, request 64-bit compilerNat Goodspeed
2020-06-16SL-10297: remove mac-crash-logger from viewer-manifest, require the bugsplat ...Oz Linden
2020-06-15SL-10297: merge up to master at 6.4.3Oz Linden
2020-06-02Merge branch 'master' into DRTVWR-503-maintAndrey Lihatskiy
2020-06-02DRTVWR-476: Merge branch 'master' of bitbucket.org:lindenlab/viewer into d476.Nat Goodspeed
2020-05-20Remove DirectX.cmake. With recent SDKs (dating back to at least VS 2013Nicky Dasmijn
2020-05-11DRTVWR-476: Use find_library(dxguid) rather than find_path().Nat Goodspeed
2020-05-07DRTVWR-476: Help DirectX.cmake cope with multiple SDK versions.Nat Goodspeed
2020-05-06DRTVWR-476: Merge branch 'master' of lindenlab/viewer into DRTVWR-476-boost-1.72Nat Goodspeed
2020-05-05Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
2020-04-20Merged master into DRTVWR-508Andrey Kleshchev
2020-04-09DRTVWR-476: For Boost 1.72, must suffix lib names with -x{32,64}Nat Goodspeed
2020-03-25DRTVWR-476, SL-12205: Refactor MSVC redist library copying.Nat Goodspeed
2020-03-25DRTVWR-476, SL-12205: Search for msvcp140.dll, not msvcr140.dllNat Goodspeed
2020-03-25DRTVWR-476, SL-12205: Update to glod built with VS 2017 runtime libs.Nat Goodspeed
2020-03-25DRTVWR-476: For VS 2017, MSVC_VERSION can be any of a range.Nat Goodspeed
2020-03-25DRTVWR-476: We've observed a couple different values for VS 2017.Nat Goodspeed