summaryrefslogtreecommitdiff
path: root/indra/cmake
AgeCommit message (Collapse)Author
2022-09-21SL-17238 Small cleanupAndrey Kleshchev
Implied 'branch' is now two different version-control systems behind
2022-09-21SL-17238 Merged in NickyD's cmake changesNicky Dasmijn
2022-09-20DRTVWR-568: Stop suppressing unused variable warnings -- we fixed?!Nat Goodspeed
2022-09-17Merge test cleanup.Nicky Dasmijn
2022-09-17SL-17238 MacOS build does not recognize no-unused-but-set-variableAndrey Kleshchev
2022-09-17SL-17238 Fix coding policy build issuesAndrey Kleshchev
2022-09-17MacOs packaging is weird, as Nat already did point out :(Nicky Dasmijn
Part of his change was omly taking Release builds into account, the other part from me made the same mistake. Use a generator expression with a custom command to get the symlink the way we want.
2022-09-17Cleanup sweepNicky Dasmijn
2022-09-17Only set include property on ll::bugpsplat target when on Windows.Nicky Dasmijn
The include was preveiously declared for all platforms, but the Mac package does not even ship this include directory. With the new way cmake works this will lead to an error (which is good, so we don't end with bogus include dirs).
2022-09-17Workaround to keep old cmake versions limping around.Nicky
2022-09-17Try to make sure this also works with the havok version of llphysicsextension.Nicky Dasmijn
2022-09-16Rename MESHOPTIMIZER.cmake to Meshoptimizer.cmake as those caps honestly bug me.Nicky Dasmijn
2022-09-16Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into ↵Nicky Dasmijn
DRTVWR-568_cmake
2022-09-01SL-17657: Merge branch 'more-c++17' into DRTVWR-568.Nat Goodspeed
Converting on DRTVWR-568 as the project branch going forward.
2022-09-01DRTVWR-568: Ensure parent directory exists before CREATE_LINK.Nat Goodspeed
2022-08-30DRTVWR-568: Pull in new 3p-colladadom build, tweak to VSVER number hardcoded ↵Callum Linden
into autobuild.xml for VS 2022 and update cmake script to copy the MSVC runtime (proper fix coming
2022-08-26DRTVWR-568: More cleanup of deleted obsolete std library features.Nat Goodspeed
2022-08-23DRTVWR-558: Streamline and generalize Windows Python search.Nat Goodspeed
2022-08-22DRTVWR-558: Fix builds on macOS 12.5 Monterey.Nat Goodspeed
Always search for python3[.exe] instead of plain 'python'. macOS Monterey no longer bundles Python 2 at all. Explicitly make PYTHON_EXECUTABLE a cached value so if the user edits it in CMakeCache.txt, it won't be overwritten by indra/cmake/Python.cmake. Do NOT set DYLD_LIBRARY_PATH for test executables! That has Bad Effects, as discussed in https://stackoverflow.com/q/73418423/5533635. Instead, create symlinks from build-mumble/sharedlibs/Resources -> Release/Resources and from build-mumble/test/Resources -> ../sharedlibs/Release/Resources. For test executables in sharedlibs/RelWithDebInfo and test/RelWithDebInfo, this supports our dylibs' baked-in load path @executable_path/../Resources. That load path assumes running in a standard app bundle (which the viewer in fact does), but we've been avoiding creating an app bundle for every test program. These symlinks allow us to continue doing that while avoiding DYLD_LIBRARY_PATH. Add indra/llcommon/apply.h. The LL::apply() function and its wrapper macro VAPPLY were very useful in diagnosing the problem. Tweak llleap_test.cpp. This source was modified extensively for diagnostic purposes; these are the small improvements that remain.
2022-07-17Be more explicit: Rename use_conan_binary to use_system_binary, this will ↵Nicky
allow us to reuse the macro for more than just conan.
2022-06-05Port new cmake files (Trace/Meshoptimizer) to modern cmakeNicky
2022-06-05Bring back comments for EXTERNAL_TOS and LL_IGNORE_SIGCHLDNicky
2022-06-05Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into ↵Nicky
DRTVWR-543-maint_cmake
2022-05-27Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
# 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-09SL-17376 Fix viewer failing due to missing vcruntime140_1Andrey Kleshchev
2022-05-07Remove unused LL_ARCH/LL_ARCH_DIRNicky
2022-05-07ADDRESS_SIZE auto detection was broken with python3, fix this.Nicky
- Simplify detection by using regex - OSX is always 64 bit
2022-05-07Cache ENV{LL_BUILD} to LL_BUILD_ENV:Nicky
- ENV{LL_BUILD} takes precedence - if ENV{LL_BUILD} is not set but LL_BUILD-ENV is, set ENV{LL_BUILD} to the cached version - error if none of the two is set Caching the variable and reusing it lets cmake run when not called by autobuild itself. This happens when xcode or visual studio detect it needs to be re rerun and call it for the "cmake" target. Not having LL_BUILD then makes those targets fail.
2022-05-07Remove logging.Nicky
2022-05-07Adapt gnerator expression usage to work on OSX.Nicky
2022-05-04Merge branch master (D550) into DRTVWR-546Andrey Kleshchev
# Conflicts: # indra/newview/llappviewer.h
2022-05-04Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
2022-05-01${AUTOBUILD_INSTALL_DIR}/lib/release is always needed as a fallbackNicky
linking directory.
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 20:18:46 +0000