summaryrefslogtreecommitdiff
path: root/indra/cmake
AgeCommit message (Collapse)Author
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-23Setting openal option in cache had gone poof.Nicky
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-18Enable LL_OS_DRAGDROP_ENABLED for LinuxNicky
2022-04-18zlib-ng for Linux is still broken. This needs revisiting, but at least gets ↵Nicky
up compiling for now.
2022-04-18Introduce ll::fontconfig target (missing the correct link library, but at ↵Nicky
least this gets us compiling)
2022-04-18ll::sdl had a wrong include directory.Nicky
2022-04-18Remvoe -D that had been passed in front of each entry of ↵Nicky
add_compile_definitions, this lead to '-D-D<value>'
2022-04-18- Change OpenAL to OPENAL to match the correct filename, Windows and OSX use ↵Nicky
case insesitive fielsystem, this is why it was not issues there - Remove input files that are obsolete.
2022-04-18jsoncpp includepath should not include json/. jsoncpp includes a header ↵Nicky
"features.h" which has the same name as a glibc header, allowing this header to be found without any prefix will lead to head conflicts when there is a '#include "features.h"' As a result all json headers need to be included via #include "json/reader.h"/"json/writer.h"
2022-04-17Remove function create_target and instead directly use add_libraryNicky
2022-04-17Switch to target_include_directoriesNicky
All 3Ps include dirs are treated as SYSTEM, this will stop compilers stop emitting warnings from those files and greatly helps having high warning levels and not being swamped by warnings that come from external libraries.
2022-04-17Switch over to standard target_link_libraries (cmake requirements are high ↵Nicky
enough now).
2022-04-16Remove another place where there was some hand crafted logic to deal with ↵Nicky
bugsplat defines
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-16Streamline bugsplat target:Nicky
- Fix usage of bugsplat::bugsplat by using ll::bugsplat - Use bugsplat define by importing target not by using hand crafted magic
2022-04-16Cleanup plugin, create proper target for link libraries. Remove unusedNicky
variables.
2022-04-16Pull in LL_GLOD=1 via target, not by hand crafted magic.Nicky
2022-04-16Include Linking to pull in the definition of ARCH_PREBUILT_DIRS_RELEASENicky
2022-04-16Cleanup, remove unused variableNicky
2022-04-16Make Pulseaudio.cmake just error out. a) it is broken (there is no 3pNicky
for example), the define it sets it used. The vrabiables it did set are unused. There is a case to probe for pulseaudio and this is the Linux volume catcher. But for that it is only necessary to detect the system include to get a few defines and functions
2022-04-16CleanupNicky
2022-04-16Remove unused HEADLESS caseNicky
2022-04-16CleanupNicky
2022-04-16Removed unused HEADLESS case.Nicky
2022-04-16slvoice_src_dir seems generally not used/ever valid. Not 100% sureNicky
what's with that, maybe it gets set by LLs teamcity builds?
2022-04-16Remove unused variable.Nicky
2022-04-16Initialize variables so that calling cmake with "--warn-unused-vars ↵Nicky
--warn-uninitialized" does not make it go all crazy.
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-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