summaryrefslogtreecommitdiff
path: root/indra/cmake/Copy3rdPartyLibs.cmake
AgeCommit message (Collapse)Author
2023-10-26D587 Post merge fmod issues fixAndrey Kleshchev
2023-06-05SL-18837: We no longer build Windows apr-iconv -- don't reference.Nat Goodspeed
With VS 2022 on Windows GitHub Actions runners, we can't build apr_suite at all with the upstream .sln / .vcxproj files, so we had to switch to "experimental" CMake support. However there's no CMakeLists.txt file for apr-iconv, so the Windows package omits that library.
2023-06-02SL-18837: Don't try to copy long, specific libnghttp2.14.19.0.dylib.Nat Goodspeed
The package doesn't include that any more.
2023-02-03Merge branch 'main' into DRTVWR-539Mnikolenko Productengine
# Conflicts: # doc/contributions.txt # indra/cmake/Copy3rdPartyLibs.cmake # indra/cmake/FindOpenJPEG.cmake # indra/cmake/OpenJPEG.cmake # indra/integration_tests/llui_libtest/CMakeLists.txt # indra/newview/CMakeLists.txt
2023-01-04SL-18892 FIXED Mac build fails locallyMaxim Nikolenko
2022-10-23Revert "SL-18390: speculative fix for broken notarization - part2"Nicky
This reverts commit 31917709d9f4d9d4742910ae7990009a1580b150.
2022-10-21SL-18390: speculative fix for broken notarization - part2Callum Prentice
2022-10-01SL-16542 Pull in chunks of graham's openjpeg code, update openjpeg and ↵Andrey Kleshchev
enable partial bitstreams Openjpeg was modified: "p_max_len -= l_nb_bytes_read;" was causing an overflow. I'm not sure if I did something incorectly in opj_skip/opj_seek viewer side, but seems like openjpeg should have been checking remaining space in p_max_len either way. P.S. Many thanks to Chafey and Neopallium for implementing openjpeg's partial bitstream support
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-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-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-05Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into ↵Nicky
DRTVWR-543-maint_cmake
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