diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-06-04 18:09:06 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-06-04 18:09:06 +0800 |
| commit | 4497b343cb96b12567f2eedfa93d33d0a5b66f76 (patch) | |
| tree | de8bc2ca77360a48437a03859841e810de9de394 /indra | |
| parent | 2971fde36e3a04772f317a08e5d1335161637e3c (diff) | |
Revert "Use LL's prebuilt Windows Boost for now"
This reverts commit 2bf9d234aac30ed4a85282730da0ffc83acf9adf.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/Boost.cmake | 52 |
1 files changed, 25 insertions, 27 deletions
diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake index 2c4ec193e7..9ea1f6c9a6 100644 --- a/indra/cmake/Boost.cmake +++ b/indra/cmake/Boost.cmake @@ -4,40 +4,38 @@ include(Prebuilt) 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) + set(sfx -mt) +elseif (WINDOWS) + target_include_directories( ll::boost SYSTEM INTERFACE ${prefix_result}/../include) + target_link_directories( ll::boost INTERFACE ${prefix_result}) + set(sfx -vc143-mt-x64-1_88) +else () + find_package( Boost REQUIRED ) +endif () +target_link_libraries( ll::boost INTERFACE + boost_context${sfx} + boost_fiber${sfx} + boost_filesystem${sfx} + boost_program_options${sfx} + boost_regex${sfx} + boost_system${sfx} + boost_thread${sfx} + boost_url${sfx} + ) +target_compile_definitions( ll::boost INTERFACE BOOST_BIND_GLOBAL_PLACEHOLDERS ) +return() + if( USE_CONAN ) target_link_libraries( ll::boost INTERFACE CONAN_PKG::boost ) target_compile_definitions( ll::boost INTERFACE BOOST_ALLOW_DEPRECATED_HEADERS BOOST_BIND_GLOBAL_PLACEHOLDERS ) return() endif() -if (WINDOWS) use_prebuilt_binary(boost) - target_include_directories( ll::boost SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include) -else () - 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) - set(sfx -mt) - elseif (WINDOWS) - target_include_directories( ll::boost SYSTEM INTERFACE ${prefix_result}/../include) - target_link_directories( ll::boost INTERFACE ${prefix_result}) - set(sfx -vc143-mt-x64-1_88) - else () - find_package( Boost REQUIRED ) - endif () - target_link_libraries( ll::boost INTERFACE - boost_context${sfx} - boost_fiber${sfx} - boost_filesystem${sfx} - boost_program_options${sfx} - boost_regex${sfx} - boost_system${sfx} - boost_thread${sfx} - boost_url${sfx} - ) - target_compile_definitions( ll::boost INTERFACE BOOST_BIND_GLOBAL_PLACEHOLDERS ) - return() -endif () # As of sometime between Boost 1.67 and 1.72, Boost libraries are suffixed # with the address size. |