summaryrefslogtreecommitdiff
path: root/indra/cmake
AgeCommit message (Collapse)Author
2022-04-16Do not use ${ARCH}_linux_INCLUDES atmNicky
2022-04-16Remove unset GOOGLEMOCK_INCLUDE_DIRS variable.Nicky
2022-04-16Fix a typo.Nicky
2022-04-16Only try copy voice files from slvoice_src_dir if that variable is set ↵Nicky
(seems to be the case for Windows)
2022-04-16Remove obsolete messageNicky
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-16Remove unused codeNicky
2022-04-16Simple reformat with CLionNicky
2022-04-13FindSCP.cmake is used when INSTALL_PROPRIETARY is set. Not sure what the ↵Nicky
latter does, but I suppose some internal logic on the LL build farm.
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-10Make LIB_NDOF define part of the targets interfaceNicky
2022-04-09Fix warning supression for Linux/OSX, this was broken after the first round ↵Nicky
of cmake changes on Windows. -Wno-unused-but-set-variable/-Wno-unused-variable moved from just Linux to also OSX (clang) as there's a lot of those in the code where newer xcode complains. Fixing all those places is going beyond the scope of modernizing cmake.
2022-04-09Cleanup ... use the appropriate functions to set options. BeforeNicky
this everythig was over the place how it was set, worse even with wrong functions like: - add_definitions( /arch:SSE2 ) - add_definitions(/WX) Those are each options to cl, not definitons.
2022-04-07Using Ninja leads to subtly different path than using a multi config ↵Nicky
generate like xcode or visual studio.
2022-04-07Bring packages formater step on par with 3p installation:Nicky
- When installing a 3P via use_prebuilt_binary it will pass --installdir=${AUTOBUILD_INSTALL_DIR} to autobuild. On the other hand packages-formater was not passing this option, this could lead to subtle errors when AUTOBUILD_INSTALL_DIR is different to what autobuild.xml stipulates.
2022-04-07OpenAL is not avaiable for OSX, error out in case someone selects ot.Nicky
2022-04-06Remove noexistant include directoryNicky
2022-04-06CMake 3.8.0 compatibilityNicky
2022-04-06Don't bother with debug builds,, they are long deprecated.Nicky
2022-04-06Googlemock targetNicky
2022-04-06Set PNG link targets for OSX and LinuxNicky
2022-04-06Remove erroneous characters.Nicky
2022-04-06Remove boost_signals, it is not included in the 3p package.Nicky
2022-04-06Create and use bugsplat targetNicky
2022-04-06Create and use sdl::sdl targetNicky
2022-04-06Remove erroneous lines.Nicky
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-04-06Use git for version detection fallbackNicky
2022-03-07Merge remote-tracking branch 'origin/master' into DRTVWR-550-mfaBrad Kittenbrink
2022-03-02Merged in nd_cleanup_v2 (pull request #891)Nicky Dasmijn
Remove all boost, fix calling functions on nullptrs, initialize vars Approved-by: Maxim Nikolenko Approved-by: Nat Linden Approved-by: Andrey Lihatskiy
2022-03-01Merge branch 'master' (DRTVWR-557) into DRTVWR-546Andrey Kleshchev
# 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-03-01Merge remote-tracking branch 'NickyD/viewer-cleanup:master' into ↵Andrey Lihatskiy
DRTVWR-543-maint # Conflicts: # autobuild.xml
2022-02-28There seems to be a reluctance to kill boost for VS2005(!), lets get ridNicky
of it.
2022-02-28Merge remote-tracking branch 'll/master'Nicky
2022-02-28Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
2022-02-18Brinng back indra/cmake/LLAppearanceUtility.cmake as well.Nicky
2022-02-11Spring cleaning, remove all traces of old 32 bit darwin/linux packages.Nicky
2022-01-14DRTVWR-550 unbreak debug build linking on DARWIN. -d suffux libs havent ↵Brad Kittenbrink
existed for a while
2022-01-12SL-16614 Viewer's uploader crash with RenderGLCoreProfileAndrey Kleshchev
2021-12-26Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
2021-12-16Merge branch 'SL-15742' into DRTVWR-527-maintAndrey Lihatskiy
2021-12-15DRTVWR-546 merge up to 6.5.2Dave Houlton
2021-12-10SL-15742: Convert build scripts to Python 3Bennett Goble
This changeset makes it possible to build the Second Life viewer using Python 3. It is designed to be used with an equivalent Autobuild branch so that a developer can compile without needing Python 2 on their machine. Breaking change: Python 2 support ending Rather than supporting two versions of Python, including one that was discontinued at the beginning of the year, this branch focuses on pouring future effort into Python 3 only. As a result, scripts do not need to be backwards compatible. This means that build environments, be they on personal computers and on build agents, need to have a compatible interpreter. Notes - SLVersionChecker will still use Python 2 on macOS - Fixed the message template url used by template_verifier.py
2021-11-29Merge branch 'DRTVWR-542-meshopt' into DRTVWR-546Andrey Kleshchev
2021-11-19Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llagentwearables.cpp # indra/newview/llvoicevivox.cpp
2021-11-16DRTVWR-546 exterminate tab char from 00-Common.cmake (fails Mac build)Dave Houlton
2021-11-16DRTVWR-546 merge in master v6.5.1Dave Houlton
2021-11-16Merge branch master (DRTVWR-545) into DRTVWR-542-meshoptAndrey Kleshchev