c7366f4c55
SL-17238 Fix coding policy build issues
2022-09-17 19:30:31 +03:00
7a71cea15b
Workaround to keep old cmake versions limping around.
2022-09-17 12:02:25 +02:00
31341ac605
Settings the startup project must come *after* add_subdirectory(newview). Only after this directory is added the target will be known and can be manipulated.
2022-09-16 23:53:32 +02:00
0710d95f4b
Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into DRTVWR-568_cmake
2022-09-16 23:15:49 +02:00
56d5666f9a
DRTVWR-568 need to update cmake minimum
2022-08-30 14:43:34 -07:00
3f31d0b5a7
Be more explicit: Rename use_conan_binary to use_system_binary, this will allow us to reuse the macro for more than just conan.
2022-07-17 17:51:25 +02:00
95d5938eef
Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into DRTVWR-543-maint_cmake
2022-06-05 14:27:28 +02:00
3da7a50b71
Merge branch 'master' into DRTVWR-543-maint
...
# 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-27 02:51:33 +03:00
d6b34d41af
Finishing touches, making sure even with conan all needed 3ps are installed and usable.
...
This brings the source to be able to run tests in conan mode.
2022-04-19 20:28:34 +02:00
2b151e0aef
Round one to support conan for 3P packages, this allows to build the viewer on Linux again.
2022-04-18 18:11:43 +02:00
5aa81b1659
Remove obsolete targets and dependencies.
2022-04-18 03:14:49 +02:00
a9774d3427
Request C++ standard via standard cmake.
2022-04-16 15:35:13 +02:00
b9f94c0897
Now there is a oslibrary target get rid of some more obsolete vars:
...
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-16 15:33:32 +02:00
0980a94341
Bump cmake version needed up to 3.16 so target_precompile_headers can be
...
used.
2022-04-09 20:15:07 +02:00
6e1ae6ec7b
Raise the bar to cmake 3.13, this gives access to more modern
...
constructs.
2022-04-09 19:03:44 +02:00
970b6661cd
Merge branch 'master' into DRTVWR-543-maint
2021-12-26 14:01:17 +02:00
cf35d27dfb
DRTVWR-546 merge up to 6.5.2
2021-12-15 14:37:18 -07:00
12d68c3f6c
Merge branch 'master' into DRTVWR-543-maint
...
# Conflicts:
# autobuild.xml
# indra/CMakeLists.txt
# indra/llcommon/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/llappviewerwin32.h
2021-10-22 16:29:58 +03:00
3c2ccd879c
Merge with master after latest Viewer release
2021-10-13 16:54:08 -07:00
20e05a5c11
Merge branch master (DRTVWR-520) into DRTVWR-542-meshopt
2021-10-14 01:01:09 +03:00
454b029d9c
DRTVWR-543: Fix local Mac builds with BugSplat. (Thanks NickyD!)
...
With the affected line, local Mac builds with BugSplat enabled fail. Without
it, they build clean.
2021-09-27 13:44:09 -04:00
a791a22b1b
SL-14541 remove mac-crash-logger
2021-09-09 02:17:36 +03:00
6e200800ed
SL-14541 removed breakpad, win_crash_logger
...
# 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-09-08 22:38:46 +03:00
97f09de4fc
Merge branch 'master' into DRTVWR-520-apple-notarization
...
# 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-08-12 23:13:12 +03:00
b8d846f0ed
Merge master (DRTVWR-516) into DRTVWR-542-meshopt
2021-07-20 00:58:09 +03:00
8631a7a077
Merge with tip of Master after a Viewer release
2021-07-19 14:35:44 -07:00
97c954dd84
SL-15522 Initial addition of meshoptimizer
2021-07-07 00:42:31 +03:00
430661f135
SL-15170 remove mac_crash_logger
2021-04-26 20:31:32 +03:00
6b73a8331f
SL-14541 removed breakpad, win_crash_logger, updated zlib
2021-03-17 00:19:38 +02:00
168d177197
This set of changes reverts the merge with master (git revert c83e740) and 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-09 14:39:51 -08:00
c83e740ef9
Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519"
...
This reverts commit e61f485a0400c47d079f
2021-03-08 13:56:16 +00:00
d9448c6f52
The folder where the disk cache lives was originally renamed from llvfs to 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-17 09:45:06 -07:00
3fc07dea01
First part of change to remove LLVFS from the Viewer. Consists of code 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-09-16 18:53:24 -07:00
a9d271c5a2
SL-10297 merged 6.4.7
2020-08-24 13:11:07 -04:00
b5bb0794f0
[DRTVWR-476] - fix linking
2020-03-25 18:39:20 -04:00
de5c07ec50
do not build the old crash logger when using bugsplat
2019-10-07 10:50:32 -04:00
b6f1529b5a
remove the old crash logger modules when using BugSplat
2019-06-06 09:25:15 -04:00
e409c0492f
convert to an explicit USE_BUGSPLAT switch in cmake, revise LL_ERRS approach
2019-03-02 11:58:11 -05:00
2b3254ef24
Better VS studio support
2019-03-19 18:04:59 +02:00
9fd463bd94
remove only-partially-successful attempt to put teamcity blocks around targets
2018-09-07 09:13:57 -04:00
49c483eeb3
add more block structure to TeamCity log output for components
2018-09-05 18:07:35 -04:00
b0d8f3a1ab
MAINT-4532: properly detect Windows 10 in the 64bit build (only - 32bit runs in Windows 8 compatibility mode)
2017-07-10 16:30:28 -04:00
6a393ada3e
MAINT-6928: Add in Python 2.6.6 modules
2017-04-10 13:33:55 -07:00
c8c143e774
SL-323: first pass at ripping out old updater
2016-08-18 13:05:30 -07:00
867ef882fd
merge changes for OPEN-292
2016-02-07 13:41:41 -08:00
bc22e58743
merge changes for 4.0.1-release
2016-01-15 16:55:04 -05:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
cb7f84a470
MAINT-5687: Remove old webkit from the make files and the repo. Ensure that it is no longer meaningfully referenced.
2015-10-02 11:14:28 -07:00
79ae34c131
move doxygen generation to a subdirectory
2015-07-10 12:24:21 -04:00
aa630cac08
merge buildcleanup
2015-06-25 12:13:10 -04:00
Andrey Kleshchev