summaryrefslogtreecommitdiff
path: root/indra/cmake/Copy3rdPartyLibs.cmake
AgeCommit message (Collapse)Author
2022-05-09SL-17376 Fix viewer failing due to missing vcruntime140_1Andrey Kleshchev
2022-05-07Adapt gnerator expression usage to work on OSX.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-04-18Round one to support conan for 3P packages, this allows to build the viewer ↵Nicky
on Linux again.
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-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-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-16Only try copy voice files from slvoice_src_dir if that variable is set ↵Nicky
(seems to be the case for Windows)
2022-04-13Remove obsolete and unmaintained USE_SYSTEMLIBSNicky
2021-11-29Merge branch 'DRTVWR-542-meshopt' into DRTVWR-546Andrey Kleshchev
2021-11-10SL-14403 Removed glodAndrey Kleshchev
2021-10-13Merge branch 'master' v6.4.24 into DRTVWR-546Dave Houlton
2021-09-22SL-16031 Add support for VS 2019 (requires autobuild 1.2-alpha)Dave Parks
2021-09-08SL-15211 SL-14541 Update OpenSSL libraryAndrey Kleshchev
Moving a copy of OpenSSL 1.1.1 to D543 from D520 to have less conflicts with zlib-ng integration later
2021-09-08SL-14541 removed breakpad, win_crash_loggerAndrey Kleshchev
# 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-08-12Merge branch 'master' into DRTVWR-520-apple-notarizationAndrey Lihatskiy
# 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-05-27SL-15211 Update OpenSSL libraryAndrey Kleshchev
2021-05-12SL-10297: Merge branch 'sl-10297-oz' into sl-10297.Nat Goodspeed
Bring in Oz's tweaks to the way BugSplat is engaged and tested, plus a few other miscellaneous goodies.
2021-04-30Merge branch 'master' into DRTVWR-520-apple-notarizationAndrey Lihatskiy
2021-03-17SL-14541 follow-up xcode buildfixAndrey Lihatskiy
2021-01-16SL-14597 Fixed mac library only including symlinkAndrey Kleshchev
2021-01-16SL-14597 Pulled in updated uriparserAndrey Kleshchev
Due to crash inside uriparser's code
2020-08-24SL-10297 merged 6.4.7Oz Linden
2020-08-11Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
# Conflicts: # indra/cmake/DirectX.cmake # indra/newview/llviewerparcelmedia.cpp # indra/newview/viewer_manifest.py
2020-07-22Mac buildfixAndrey Lihatskiy
2020-06-15SL-10297: merge up to master at 6.4.3Oz Linden
2020-06-02Merge branch 'master' into DRTVWR-503-maintAndrey Lihatskiy
# Conflicts: # indra/newview/CMakeLists.txt # indra/newview/viewer_manifest.py
2020-06-02DRTVWR-476: Merge branch 'master' of bitbucket.org:lindenlab/viewer into d476.Nat Goodspeed
2020-03-25DRTVWR-476, SL-12205: Refactor MSVC redist library copying.Nat Goodspeed
Specify all of msvcp$VER.dll, msvcr$VER.dll and vcruntime$VER.dll -- but check each of them individually, because any given VS release has only a subset of those. Add messaging to clarify what we're doing. Introduce to_staging_dirs CMake macro to cut down on redundant boilerplate: the idiom in which we use copy_if_different twice, once to the Release staging directory and once to the RelWithDebInfo staging directory, each time appending the target pathnames to third_party_targets. Replace that idiom with calls to to_staging_dirs.
2020-03-25DRTVWR-476, SL-12205: Search for msvcp140.dll, not msvcr140.dllNat Goodspeed
Evidently, with VS 2017, what would have been msvcr140.dll has become vcruntime140.dll instead. msvcr140.dll is no longer a good sample DLL for which to search.
2020-03-25DRTVWR-476, SL-12205: Update to glod built with VS 2017 runtime libs.Nat Goodspeed
2020-03-25DRTVWR-476: For VS 2017, MSVC_VERSION can be any of a range.Nat Goodspeed
Thanks NickyD.
2020-03-25DRTVWR-476: We've observed a couple different values for VS 2017.Nat Goodspeed
2020-03-25DRTVWR-476: On Mac, copy libhunspell-1.3.0.dylib for test programs.Nat Goodspeed
2020-03-25[DRTVWR-476] - update openjpegAnchor
2020-03-25[DRTVWR-476] - fix openjpeg dll pathAnchor
2020-03-25[DRTVWR-476] - fix msvc versionAnchor
2020-03-25DRTVWR-476: Update Copy3rdPartyLibs.cmake for VS 2017 version.Nat Goodspeed
Also, on Windows, put build output into build-vc$AUTOBUILD_VSVER-$AUTOBUILD_ADDRSIZE instead of hard-coding build-vc120-$AUTOBUILD_ADDRSIZE.
2020-02-14SL-12707 Build Fails Without FMODAndrey Kleshchev
Also adds correct working directory to RelWithDebInfoOS and enables OpenAl on OS builds for windows
2020-02-04SL-12654 Remove support for building with fmod exAndrey Kleshchev
2020-01-31Merged in SL-11445 Upgrade Fmodex to Fmod StudioAndrey Kleshchev
2019-09-06handle slvoice executable separately from the vivox libraries, and update ↵Oz Linden
mac slvoice package
2019-07-16update Vivox for VOICE-56Oz Linden
2019-03-02convert to an explicit USE_BUGSPLAT switch in cmake, revise LL_ERRS approachOz Linden
2018-08-24DRTVWR-447: Introduce explicit CMake BUGSPLAT_DB variable.Nat Goodspeed
Define the CMake cache variable, with empty string as its default. Make build.sh pass the BUGSPLAT_DB environment variable as a CMake command-line variable assignment. Change CMake 'if (DEFINED ENV{BUGSPLAT_DB})' to plain 'if (BUGSPLAT_DB)'. Make CMake pass new --bugsplat switch to every one of SIX different invocations of viewer_manifest.py. Give llmanifest.main() function an argument to allow supplementing the base set of command-line switches with additional application-specific switches. In viewer_manifest.py, define new --bugsplat command-line switch and pass to llmanifest.main(). Instead of consulting os.environ['BUGSPLAT_DB'], consult self.args['bugsplat'].
2018-05-25SL-821: export BUGSPLAT_DB when loaded so child processes can detect.Nat Goodspeed
Produce CMake message when BugSplat is engaged so we can detect in build log. Don't try to copy BugSplat DLLs when NOT engaged.
2018-04-12Automated merge with tip of viewer-release after Viewer Media Update releasecallum_linden
2018-01-18correct 64bit vivox dll namesOz Linden
2018-01-18more places where vivox names must be conditional on address sizeOz Linden
2018-01-17merge 5.1.0-releaseOz Linden
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 22:31:48 +0000