diff options
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/Boost.cmake | 8 | ||||
| -rw-r--r-- | indra/cmake/LLPrimitive.cmake | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake index 0d5137304b..9296ebe109 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_88) + set(sfx -vc143-mt-a64-1_89) else () - set(sfx -vc143-mt-x64-1_88) + set(sfx -vc143-mt-x64-1_89) endif () else () find_package( Boost REQUIRED ) @@ -25,7 +25,6 @@ target_link_libraries( ll::boost INTERFACE boost_fiber${sfx} boost_filesystem${sfx} boost_program_options${sfx} - boost_system${sfx} boost_thread${sfx} boost_url${sfx} ) @@ -34,6 +33,9 @@ if (WINDOWS) else () target_link_libraries( ll::boost INTERFACE boost_regex${sfx}) endif () +if (NOT (${LINUX_DISTRO} MATCHES opensuse-tumbleweed OR WINDOWS)) + target_link_libraries( ll::boost INTERFACE boost_system${sfx}) +endif () target_compile_definitions( ll::boost INTERFACE BOOST_BIND_GLOBAL_PLACEHOLDERS ) return() diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake index dba5f85b3e..d2745982dd 100644 --- a/indra/cmake/LLPrimitive.cmake +++ b/indra/cmake/LLPrimitive.cmake @@ -60,9 +60,9 @@ else () 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_88) + set(BOOST_LIBRARY_SUFFIX -vc143-mt-a64-1_89) else () - set(BOOST_LIBRARY_SUFFIX -vc143-mt-x64-1_88) + set(BOOST_LIBRARY_SUFFIX -vc143-mt-x64-1_89) endif () endif () file(MAKE_DIRECTORY ${LIBS_PREBUILT_DIR}/include/collada/1.4) |