diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-10-10 17:04:47 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-10-10 17:04:47 +0800 |
| commit | 304d6fc43eb114599117e0ba6d3eb33b85ec15b7 (patch) | |
| tree | 69e0a7bc421e668665bd06d70e5986fc5c681af1 /indra/cmake | |
| parent | 081a44dcbc604beb142c208f540bdbc95e754634 (diff) | |
| parent | c54df44ae195c2bc6ac697eac35ac2daf6a288c0 (diff) | |
Merge branch 'main' into 2025.07
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/Boost.cmake | 12 | ||||
| -rw-r--r-- | indra/cmake/LLPrimitive.cmake | 8 |
2 files changed, 11 insertions, 9 deletions
diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake index 6fc969a62a..d34fab9a33 100644 --- a/indra/cmake/Boost.cmake +++ b/indra/cmake/Boost.cmake @@ -6,16 +6,16 @@ include_guard() add_library( ll::boost INTERFACE IMPORTED ) if (DARWIN) - target_include_directories( ll::boost SYSTEM INTERFACE /opt/local/libexec/boost/1.87/include) - target_link_directories( ll::boost INTERFACE /opt/local/libexec/boost/1.87/lib) + target_include_directories( ll::boost SYSTEM INTERFACE /opt/local/libexec/boost/1.88/include) + target_link_directories( ll::boost INTERFACE /opt/local/libexec/boost/1.88/lib) set(sfx -mt) 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 ) @@ -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 f8a58e18a1..5fc34d027c 100644 --- a/indra/cmake/LLPrimitive.cmake +++ b/indra/cmake/LLPrimitive.cmake @@ -53,16 +53,16 @@ else () ) endif () if (DARWIN) - set(BOOST_CFLAGS -I${Libxml2_LIBRARY_DIRS}exec/boost/1.87/include) - set(BOOST_LIBS -L${Minizip_LIBRARY_DIRS}exec/boost/1.87/lib) + set(BOOST_CFLAGS -I${Libxml2_LIBRARY_DIRS}exec/boost/1.88/include) + set(BOOST_LIBS -L${Minizip_LIBRARY_DIRS}exec/boost/1.88/lib) set(BOOST_LIBRARY_SUFFIX -mt) elseif (WINDOWS) 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) |