summaryrefslogtreecommitdiff
path: root/indra/newview/CMakeLists.txt
AgeCommit message (Collapse)Author
2022-05-26Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
# Conflicts: # indra/newview/llviewertexturelist.cpp
2022-05-08- Slightly better documentation string for --configuration, as this really ↵Nicky
is used for the configs build subdirectory. - Always pass the correct configuration for --buildtype - Use 'buildtype' when determining defbug/release/... build. --configuration should not be used for this, as it is the subdirectories name (CMAKE_CFG_INTDIR)
2022-05-07Adapt gnerator expression usage to work on OSX.Nicky
2022-05-06Merged in SL-17274 (pull request #964)Michael Pohoreski
SL-17274: Stub for PBR DrawPool and shader Approved-by: Euclid Linden Approved-by: Dave Parks
2022-05-04SL-17283 LLReflectionMapManager prototype. Remove snapshot code related ↵Dave Parks
overhead from reflection map renders. Add parallax correction and support for multiple reflection maps.
2022-05-02SL-17274: Stub for PBR DrawPool and shaderPtolemy
2022-05-01Another place that needed generator expressions.Nicky
2022-05-01Simplify cmake files by uaing generator expressions and be moreNicky
configuration specific, rather than staging files to Release and RelWithdebInfo all the time
2022-05-01Remove setting of HEADER_FILE_ONLY on .h* files, cmake automaticallyNicky
sets the property on those.
2022-04-28SL-17281 environment map prototype (stupid slow and hacky, but provides a ↵Dave Parks
way to get a "real" environment map for shader development)
2022-04-26Merge branch 'DRTVWR-546' into DRTVWR-539Mnikolenko Productengine
2022-04-18Merge branch master (D540) into DRTVWR-546Andrey Kleshchev
# Conflicts: # indra/llcommon/llsdutil.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/lldrawpoolalpha.cpp # indra/newview/lldrawpoolwater.cpp
2022-04-18Merge remote-tracking branch 'origin/DRTVWR-543-maint' into ↵Nicky
DRTVWR-543-maint_cmake
2022-04-18Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2022-04-18Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
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-17Remove function create_target and instead directly use add_libraryNicky
2022-04-17Switch over to standard target_link_libraries (cmake requirements are high ↵Nicky
enough now).
2022-04-16Streamline fmodstudio/openal targets:Nicky
- Targets now define the appropriate c++ defines, no more hand magic needed for llstartup.cpp - Switch cmakeflage to USE_xxx rather than xxx as it was before. I personally find the USE_X notion more intuitive and it follows how KDU is used. - To be backward compatible OPENAL/FMODSTUDIO flag will be mapped to USE_OPENAL/USE_FMODSTUDIO
2022-04-16Remove undefined variablesNicky
2022-04-16Pull in LL_GLOD=1 via target, not by hand crafted magic.Nicky
2022-04-16Use variable LLSTARTUP_COMPILE_FLAGS only when it is defined.Nicky
2022-04-16Remove some more obsolete includes (UnixInstall) and include_directories()Nicky
2022-04-16create target ll::uilibraries to have one common target that defines what eachNicky
operation system needs as dependencies on OS gui libraries.
2022-04-16Go back to more modern way to compile the physics stubNicky
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-16Create a new target ll::oslibrary to link against libs specific to the OS ↵Nicky
compiled on. This gets rid of the a few OS specific set and uses variables (which some even seemed mostly duplicate like WINDOWS_LIBRARIES ans UI_LIBRARIES) and it also solves the problem of having them to tack on every target, as of no they come as a transitive dependency from llcommon
2022-04-13Rework cmake, the original plan was to maybe be able to use conan targets ↵Nicky
with the same name (that's why 3ps had names like apr::apr), but it's safer and saner to put the LL 3ps under the ll:: prefix. This also allows means it is possible to get rid of that bad "if( TRAGET ...) return() endif()" pattern and rather use include_guard().
2022-04-13Remove obsolete and unmaintained USE_SYSTEMLIBSNicky
2022-04-09Cleanup windows step that copies input artifacts. Make sure the rightNicky
paths are used, throw out files not even existing anymore.
2022-04-09Bump cmake version needed up to 3.16 so target_precompile_headers can beNicky
used.
2022-04-06CMake 3.8.0 compatibility for the ugly havok/stub 3p which really isNicky
just a source tarball
2022-04-06Create and use bugsplat targetNicky
2022-04-06Create and use sdl::sdl targetNicky
2022-04-06Move CMake files to modernized cmake syntax, step 1.Nicky
Change projects to cmake targetsto get rid of havig to hardcore include directories and link libraries in consumer projects.
2022-03-02Merge branch 'DRTVWR-546' into DRTVWR-539Mnikolenko Productengine
# Conflicts: # indra/llcommon/tests/llprocess_test.cpp # indra/llui/llcombobox.cpp # indra/llui/llcombobox.h # indra/newview/VIEWER_VERSION.txt # indra/newview/llviewertexturelist.cpp # indra/newview/llvovolume.cpp
2022-03-02Merge branch 'master' into DRTVWR-539Mnikolenko Productengine
# Conflicts: # autobuild.xml # doc/contributions.txt # indra/cmake/GLOD.cmake # indra/llcommon/tests/llprocess_test.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/lldrawpoolavatar.cpp # indra/newview/llfloatermodelpreview.cpp # indra/newview/llmodelpreview.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvovolume.cpp # indra/newview/viewer_manifest.py
2022-02-28Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
# Conflicts: # indra/newview/llviewermenu.cpp
2022-02-28Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
2022-01-27SL-16717 Rename RenderGLCoreProfile to prevent compatibility issuesAndrey Kleshchev
2022-01-21Merge remote-tracking branch 'remotes/origin/DRTVWR-546' into DRTVWR-539Runitai Linden
# Conflicts: # indra/llcommon/lltracerecording.h # indra/newview/llfloaterpreference.cpp
2022-01-12SL-16614 Viewer's uploader crash with RenderGLCoreProfileAndrey Kleshchev
2022-01-11SL-16614 Viewer's uploader crash with RenderGLCoreProfileAndrey Kleshchev
2021-12-26Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
2021-12-26Merge branch 'master' into DRTVWR-540-maintAndrey Lihatskiy
2021-12-26Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2021-12-20Merge branch 'master' into DRTVWR-539Mnikolenko Productengine
2021-12-15DRTVWR-546 merge up to 6.5.2Dave Houlton
2021-12-03SL-16436 and SL-16327 Fix for RenderDebugGL test failures and fix for grey ↵Dave Parks
textures