diff options
Diffstat (limited to 'indra/cmake/Boost.cmake')
| -rw-r--r-- | indra/cmake/Boost.cmake | 149 |
1 files changed, 63 insertions, 86 deletions
diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake index 9746704907..46600ef029 100644 --- a/indra/cmake/Boost.cmake +++ b/indra/cmake/Boost.cmake @@ -1,5 +1,6 @@ # -*- cmake -*- include(Prebuilt) +include(Linking) include_guard() @@ -36,6 +37,7 @@ if (NOT (${LINUX_DISTRO} MATCHES freedesktop)) boost_context${sfx} boost_fiber${sfx} boost_filesystem${sfx} + boost_process${sfx} boost_program_options${sfx} boost_thread${sfx} boost_url${sfx} @@ -64,103 +66,78 @@ use_prebuilt_binary(boost) # with the address size. set(addrsfx "-x${ADDRESS_SIZE}") -if (WINDOWS) - - find_library(BOOST_CONTEXT_LIBRARY - NAMES - libboost_context - libboost_context-mt - libboost_context-mt${addrsfx} - PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH) - - find_library(BOOST_FIBER_LIBRARY - NAMES - libboost_fiber - libboost_fiber-mt - libboost_fiber-mt${addrsfx} - PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH) - - find_library(BOOST_FILESYSTEM_LIBRARY - NAMES - libboost_filesystem - libboost_filesystem-mt - libboost_filesystem-mt${addrsfx} - PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH) - - find_library(BOOST_PROGRAMOPTIONS_LIBRARY - NAMES - libboost_program_options - libboost_program_options-mt - libboost_program_options-mt${addrsfx} - PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH) - - find_library(BOOST_THREAD_LIBRARY - NAMES - libboost_thread - libboost_thread-mt - libboost_thread-mt${addrsfx} - PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH) - - find_library(BOOST_URL_LIBRARY - NAMES - libboost_url - libboost_url-mt - libboost_url-mt${addrsfx} - PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH) +find_library(BOOST_CONTEXT_LIBRARY + NAMES + libboost_context + libboost_context-mt + libboost_context-mt${addrsfx} + boost_context + boost_context-mt + boost_context-mt${addrsfx} + PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH) -else (WINDOWS) +find_library(BOOST_FIBER_LIBRARY + NAMES + libboost_fiber + libboost_fiber-mt + libboost_fiber-mt${addrsfx} + boost_fiber + boost_fiber-mt + boost_fiber-mt${addrsfx} + PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH) - find_library(BOOST_CONTEXT_LIBRARY - NAMES - boost_context - boost_context-mt - boost_context-mt${addrsfx} - PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH) +find_library(BOOST_FILESYSTEM_LIBRARY + NAMES + libboost_filesystem + libboost_filesystem-mt + libboost_filesystem-mt${addrsfx} + boost_filesystem + boost_filesystem-mt + boost_filesystem-mt${addrsfx} + PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH) - find_library(BOOST_FIBER_LIBRARY - NAMES - boost_fiber - boost_fiber-mt - boost_fiber-mt${addrsfx} - PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH) +find_library(BOOST_PROGRAMOPTIONS_LIBRARY + NAMES + libboost_program_options + libboost_program_options-mt + libboost_program_options-mt${addrsfx} + boost_program_options + boost_program_options-mt + boost_program_options-mt${addrsfx} + PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH) - find_library(BOOST_FILESYSTEM_LIBRARY - NAMES - boost_filesystem - boost_filesystem-mt - boost_filesystem-mt${addrsfx} - PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH) +find_library(BOOST_URL_LIBRARY + NAMES + libboost_url + libboost_url-mt + libboost_url-mt${addrsfx} + boost_url + boost_url-mt + boost_url-mt${addrsfx} + PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH) - find_library(BOOST_PROGRAMOPTIONS_LIBRARY - NAMES - boost_program_options - boost_program_options-mt - boost_program_options-mt${addrsfx} - PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH) - - find_library(BOOST_THREAD_LIBRARY - NAMES - boost_thread - boost_thread-mt - boost_thread-mt${addrsfx} - PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH) - - find_library(BOOST_URL_LIBRARY - NAMES - boost_url - boost_url-mt - boost_url-mt${addrsfx} - PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH) - -endif (WINDOWS) +find_library(BOOST_PROCESS_LIBRARY + NAMES + libboost_process + libboost_process-mt + libboost_process-mt${addrsfx} + boost_process + boost_process-mt + boost_process-mt${addrsfx} + PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH) target_link_libraries(ll::boost INTERFACE ${BOOST_FIBER_LIBRARY} ${BOOST_CONTEXT_LIBRARY} ${BOOST_FILESYSTEM_LIBRARY} ${BOOST_PROGRAMOPTIONS_LIBRARY} - ${BOOST_THREAD_LIBRARY} - ${BOOST_URL_LIBRARY}) + ${BOOST_URL_LIBRARY} + ${BOOST_PROCESS_LIBRARY}) + +if (WINDOWS) + # Boost.Process v2 needs ntdll (NtSuspendProcess/NtResumeProcess) + target_link_libraries(ll::boost INTERFACE ntdll) +endif (WINDOWS) if (LINUX) target_link_libraries(ll::boost INTERFACE rt) |