diff options
| author | HadetTheUndying <hadet@protonmail.com> | 2026-06-01 12:51:59 -0500 |
|---|---|---|
| committer | HadetTheUndying <hadet@protonmail.com> | 2026-06-07 19:44:55 -0500 |
| commit | 17e5df749474def423c95de1cbf67ca946b5b312 (patch) | |
| tree | b76cfae0b3d3820f349a08c0eea897e15e6d427b /indra/newview/ViewerInstall.cmake | |
| parent | 4a48c18093f164ac741664554323dccccc213719 (diff) | |
Add Windows x64 & macOS actions
Diffstat (limited to 'indra/newview/ViewerInstall.cmake')
| -rw-r--r-- | indra/newview/ViewerInstall.cmake | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/indra/newview/ViewerInstall.cmake b/indra/newview/ViewerInstall.cmake index 8f2827e1bc..7717605f1f 100644 --- a/indra/newview/ViewerInstall.cmake +++ b/indra/newview/ViewerInstall.cmake @@ -130,18 +130,29 @@ elseif (WINDOWS) set(BOOST_PLATFORM x${ADDRESS_SIZE}) endif () + # Detect the actual Boost DLL suffix from vcpkg-installed binaries. + file(GLOB _boost_context_dlls "${prefix_result}/../bin/boost_context-*.dll") + if (_boost_context_dlls) + list(GET _boost_context_dlls 0 _boost_context_dll) + get_filename_component(_boost_context_dll_name "${_boost_context_dll}" NAME_WE) + string(REPLACE "boost_context" "" BOOST_DLL_SFX "${_boost_context_dll_name}") + else () + set(BOOST_DLL_SFX -vc143-mt-${BOOST_PLATFORM}-1_91) + message(WARNING "Could not detect Boost DLL suffix via glob; using fallback '${BOOST_DLL_SFX}'.") + endif () + install( PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/${VIEWER_BINARY_NAME}.exe ${prefix_result}/../bin/OpenAL32.dll ${prefix_result}/../bin/alut.dll - ${prefix_result}/../bin/boost_context-vc143-mt-${BOOST_PLATFORM}-1_91.dll - ${prefix_result}/../bin/boost_fiber-vc143-mt-${BOOST_PLATFORM}-1_91.dll - ${prefix_result}/../bin/boost_filesystem-vc143-mt-${BOOST_PLATFORM}-1_91.dll - ${prefix_result}/../bin/boost_json-vc143-mt-${BOOST_PLATFORM}-1_91.dll - ${prefix_result}/../bin/boost_program_options-vc143-mt-${BOOST_PLATFORM}-1_91.dll - ${prefix_result}/../bin/boost_thread-vc143-mt-${BOOST_PLATFORM}-1_91.dll - ${prefix_result}/../bin/boost_url-vc143-mt-${BOOST_PLATFORM}-1_91.dll + ${prefix_result}/../bin/boost_context${BOOST_DLL_SFX}.dll + ${prefix_result}/../bin/boost_fiber${BOOST_DLL_SFX}.dll + ${prefix_result}/../bin/boost_filesystem${BOOST_DLL_SFX}.dll + ${prefix_result}/../bin/boost_json${BOOST_DLL_SFX}.dll + ${prefix_result}/../bin/boost_program_options${BOOST_DLL_SFX}.dll + ${prefix_result}/../bin/boost_thread${BOOST_DLL_SFX}.dll + ${prefix_result}/../bin/boost_url${BOOST_DLL_SFX}.dll ${prefix_result}/../bin/brotlicommon.dll ${prefix_result}/../bin/brotlidec.dll ${prefix_result}/../bin/bz2.dll @@ -176,8 +187,8 @@ elseif (WINDOWS) install( PROGRAMS - ${prefix_result}/../bin/boost_context-vc143-mt-${BOOST_PLATFORM}-1_91.dll - ${prefix_result}/../bin/boost_fiber-vc143-mt-${BOOST_PLATFORM}-1_91.dll + ${prefix_result}/../bin/boost_context${BOOST_DLL_SFX}.dll + ${prefix_result}/../bin/boost_fiber${BOOST_DLL_SFX}.dll ${prefix_result}/../bin/libapr-1.dll ${prefix_result}/../bin/libaprutil-1.dll ${prefix_result}/../bin/libexpat.dll |