diff options
| author | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2026-07-14 23:24:48 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-07-14 23:24:48 +0300 |
| commit | 8b909b6e4397efac013bebed965b91bc28b04679 (patch) | |
| tree | 3aa13992564cfd07db1a196cacc858a0178f50f3 /indra/cmake | |
| parent | d9f67028b515dfdc7d8f3b8bf73b1f23a8ed1273 (diff) | |
#5994 Replace apr with boost in LLProcess
Replace apr's process with boost::process::v2 in LLProcess
Note: this is mostly copilot-made
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/Boost.cmake | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake index 3bea85f3ea..bf34d1beae 100644 --- a/indra/cmake/Boost.cmake +++ b/indra/cmake/Boost.cmake @@ -60,6 +60,14 @@ if (WINDOWS) libboost_url-mt${addrsfx} PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH) + # Add Boost.Process library + find_library(BOOST_PROCESS_LIBRARY + NAMES + libboost_process + libboost_process-mt + libboost_process-mt${addrsfx} + PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH) + else (WINDOWS) find_library(BOOST_CONTEXT_LIBRARY @@ -104,6 +112,14 @@ else (WINDOWS) boost_url-mt${addrsfx} PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH) + # Add Boost.Process library + find_library(BOOST_PROCESS_LIBRARY + NAMES + boost_process + boost_process-mt + boost_process-mt${addrsfx} + PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH) + endif (WINDOWS) target_link_libraries(ll::boost INTERFACE @@ -112,7 +128,14 @@ target_link_libraries(ll::boost INTERFACE ${BOOST_FILESYSTEM_LIBRARY} ${BOOST_PROGRAMOPTIONS_LIBRARY} ${BOOST_THREAD_LIBRARY} - ${BOOST_URL_LIBRARY}) + ${BOOST_URL_LIBRARY} + ${BOOST_PROCESS_LIBRARY}) + +if (WINDOWS) + # Boost.Process v2 on Windows requires ntdll for NtSuspendProcess, + # NtResumeProcess and RtlNtStatusToDosError + target_link_libraries(ll::boost INTERFACE ntdll) +endif (WINDOWS) if (LINUX) target_link_libraries(ll::boost INTERFACE rt) |