diff options
Diffstat (limited to 'indra/newview/ViewerInstall.cmake')
| -rw-r--r-- | indra/newview/ViewerInstall.cmake | 61 |
1 files changed, 48 insertions, 13 deletions
diff --git a/indra/newview/ViewerInstall.cmake b/indra/newview/ViewerInstall.cmake index 56a3394943..46b2967f2c 100644 --- a/indra/newview/ViewerInstall.cmake +++ b/indra/newview/ViewerInstall.cmake @@ -75,13 +75,37 @@ if (DARWIN) ${CMAKE_CURRENT_SOURCE_DIR}/FixPackage.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/FixBundle.cmake ) - else (PACKAGE) + if (CMAKE_OSX_ARCHITECTURES MATCHES x86_64) + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/SignPackageMmxSse2.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/SignBundleMmxSse2.cmake + ) + endif () + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/SignPackage.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/SignBundle.cmake + ) + else () configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/FixBundle.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/FixBundle.cmake ) - endif (PACKAGE) + if (CMAKE_OSX_ARCHITECTURES MATCHES x86_64) + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/SignBundleMmxSse2.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/SignBundleMmxSse2.cmake + ) + endif () + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/SignBundle.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/SignBundle.cmake + ) + endif () install(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/FixBundle.cmake) + if (CMAKE_OSX_ARCHITECTURES MATCHES x86_64) + install(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/SignBundleMmxSse2.cmake) + endif () + install(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/SignBundle.cmake) elseif (WINDOWS) @@ -130,18 +154,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 +211,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 @@ -201,7 +236,7 @@ if (LINUX) if (USE_DISCORD) install( FILES ${ARCH_PREBUILT_DIRS_RELEASE}/libdiscord_partner_sdk.so - DESTINATION ${_LIB} + DESTINATION ${_LIB}/${VIEWER_BINARY_NAME} ) endif () if (USE_FMODSTUDIO) @@ -209,7 +244,7 @@ if (LINUX) ${ARCH_PREBUILT_DIRS_RELEASE}/libfmod.so ${ARCH_PREBUILT_DIRS_RELEASE}/libfmod.so.13 ${ARCH_PREBUILT_DIRS_RELEASE}/libfmod.so.13.34 - DESTINATION ${_LIB}) + DESTINATION ${_LIB}/${VIEWER_BINARY_NAME}) endif (USE_FMODSTUDIO) endif (LINUX) |