diff options
| author | Erik Kundiman <erik@megapahit.org> | 2026-05-09 19:41:55 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2026-05-09 19:41:55 +0800 |
| commit | f8ed78d5d6747af2fd34d973e4dd4a2a9f1b8f9c (patch) | |
| tree | 5a99a0f41c2eda3e14d3cde65b5f9e2ce15b4b81 /indra/cmake | |
| parent | 130fe36d7658df27f1f76f2c6dc93c10741e52ab (diff) | |
| parent | 128780760826b13482eb2294ca7bb1f6f1962665 (diff) | |
Merge branch 'main' into 2026.02
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/Boost.cmake | 4 | ||||
| -rw-r--r-- | indra/cmake/LLPrimitive.cmake | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake index 2ea2f1f2dc..25d673e49a 100644 --- a/indra/cmake/Boost.cmake +++ b/indra/cmake/Boost.cmake @@ -13,9 +13,9 @@ elseif (WINDOWS) target_include_directories( ll::boost SYSTEM INTERFACE ${prefix_result}/../include) target_link_directories( ll::boost INTERFACE ${prefix_result}) if ($ENV{MSYSTEM_CARCH} MATCHES aarch64) - set(sfx -vc143-mt-a64-1_90) + set(sfx -vc143-mt-a64-1_91) else () - set(sfx -vc143-mt-x64-1_90) + set(sfx -vc143-mt-x64-1_91) endif () else () find_package( Boost ) diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake index f9fd376cd6..80e3ff42ec 100644 --- a/indra/cmake/LLPrimitive.cmake +++ b/indra/cmake/LLPrimitive.cmake @@ -70,9 +70,9 @@ if (TRUE) set(BOOST_CFLAGS -I${prefix_result}/../include) set(BOOST_LIBS -L${prefix_result}) if ($ENV{MSYSTEM_CARCH} MATCHES aarch64) - set(BOOST_LIBRARY_SUFFIX -vc143-mt-a64-1_90) + set(BOOST_LIBRARY_SUFFIX -vc143-mt-a64-1_91) else () - set(BOOST_LIBRARY_SUFFIX -vc143-mt-x64-1_90) + set(BOOST_LIBRARY_SUFFIX -vc143-mt-x64-1_91) endif () elseif (CMAKE_SYSTEM_NAME MATCHES FreeBSD) set(BOOST_CFLAGS -I/usr/local/include) |