Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

We need to link with boost.thread and boost.chrono if we use boost.context #2613

Merged
merged 1 commit into from May 9, 2017
Merged

We need to link with boost.thread and boost.chrono if we use boost.context #2613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
55 changes: 26 additions & 29 deletions cmake/HPX_SetupBoost.cmake
View file
Open in desktop
Expand Up @@ -36,6 +36,29 @@ if(HPX_WITH_BOOST_CHRONO_COMPATIBILITY OR __boost_need_thread)
set(__boost_libraries ${__boost_libraries} chrono)
endif()

# Set configuration option to use Boost.Context or not. This depends on the
# platform.
set(__use_generic_coroutine_context OFF)
if(APPLE)
set(__use_generic_coroutine_context ON)
endif()
if(HPX_PLATFORM_UC STREQUAL "BLUEGENEQ" AND Boost_VERSION GREATER 105500)
set(__use_generic_coroutine_context ON)
endif()
hpx_option(
HPX_WITH_GENERIC_CONTEXT_COROUTINES
BOOL
"Use Boost.Context as the underlying coroutines context switch implementation."
${__use_generic_coroutine_context} ADVANCED)

if(HPX_WITH_GENERIC_CONTEXT_COROUTINE)
set(__boost_libraries ${__boost_libraries} context)
# if context is needed, we should still link with boost thread and chrono
if(NOT __boost_need_thread)
set(__boost_libraries ${__boost_libraries} thread chrono)
endif()
endif()

set(__boost_libraries
${__boost_libraries}
date_time
Expand All @@ -44,11 +67,7 @@ set(__boost_libraries
regex
system)

find_package(Boost
1.50
REQUIRED
COMPONENTS
${__boost_libraries})
find_package(Boost 1.51 REQUIRED COMPONENTS ${__boost_libraries})

if(NOT Boost_FOUND)
hpx_error("Could not find Boost. Please set BOOST_ROOT to point to your Boost installation.")
Expand All @@ -63,32 +82,10 @@ if(UNIX AND NOT CYGWIN)
set(Boost_TMP_LIBRARIES ${Boost_TMP_LIBRARIES} ${BOOST_UNDERLYING_THREAD_LIBRARY})
endif()

# Set configuration option to use Boost.Context or not. This depends on the Boost
# version (Boost.Context was included with 1.51) and the Platform
set(use_generic_coroutine_context OFF)
if(Boost_VERSION GREATER 105000)
find_package(Boost 1.50 QUIET COMPONENTS context)
if(Boost_CONTEXT_FOUND)
hpx_info(" context")
endif()
if(APPLE)
set(use_generic_coroutine_context ON)
endif()
if(HPX_PLATFORM_UC STREQUAL "BLUEGENEQ" AND Boost_VERSION GREATER 105500)
set(use_generic_coroutine_context ON)
endif()
endif()

hpx_option(
HPX_WITH_GENERIC_CONTEXT_COROUTINES
BOOL
"Use Boost.Context as the underlying coroutines context switch implementation."
${use_generic_coroutine_context} ADVANCED)

set(Boost_TMP_LIBRARIES ${Boost_TMP_LIBRARIES} ${Boost_LIBRARIES})

if(HPX_WITH_COMPRESSION_BZIP2 OR HPX_WITH_COMPRESSION_ZLIB)
find_package(Boost 1.49 QUIET COMPONENTS iostreams)
find_package(Boost 1.51 QUIET COMPONENTS iostreams)
if(Boost_IOSTREAMS_FOUND)
hpx_info(" iostreams")
else()
Expand All @@ -98,7 +95,7 @@ if(HPX_WITH_COMPRESSION_BZIP2 OR HPX_WITH_COMPRESSION_ZLIB)
endif()

# attempt to load Boost.Random (if available), it's needed for one example only
find_package(Boost 1.49 QUIET COMPONENTS random)
find_package(Boost 1.51 QUIET COMPONENTS random)
if(Boost_RANDOM_FOUND)
hpx_info(" random")
set(Boost_TMP_LIBRARIES ${Boost_TMP_LIBRARIES} ${Boost_LIBRARIES})
Expand Down
6 changes: 3 additions & 3 deletions docs/manual/build_system/prerequisites.qbk
View file
Open in desktop
Expand Up @@ -63,7 +63,7 @@ favorite compiler with __hpx__ visit __stellar_hpx_buildbot__.
[[__cmake__ ][3.1 ][2.8.10 ]]

[[[*Required Libraries]]]
[[__boost_libraries__ ][1.57.0 or newer ][1.50.0 ]
[[__boost_libraries__ ][1.57.0 or newer ][1.51.0 ]
[See below for an important limitation when using Boost V1.54.0.]]
[[__hwloc__ ][1.10 ][1.2 (Xeon Phi: 1.6)]
[Used for OS-thread pinning and NUMA awareness. This library is optional on Mac OSX.]]
Expand All @@ -89,10 +89,10 @@ favorite compiler with __hpx__ visit __stellar_hpx_buildbot__.
[[__visual_cxx__ (x64) ][2013 ][2013 ]]

[[[*Build System]]]
[[__cmake__ ][3.1 ][2.8.10 ]]
[[__cmake__ ][3.1 ][2.8.10 ]]

[[[*Required Libraries]]]
[[__boost__ ][1.57.0 or newer ][1.49.0 ]
[[__boost__ ][1.57.0 or newer ][1.51.0 ]
[See below for an important limitation when using Boost V1.55.0.]]
[[__hwloc__ ][1.10 ][1.5 ]
[Used for OS-thread pinning and NUMA awareness.]]
Expand Down
4 changes: 2 additions & 2 deletions hpx/config.hpp
View file
Open in desktop
Expand Up @@ -27,9 +27,9 @@

#include <boost/version.hpp>

#if BOOST_VERSION < 105000
#if BOOST_VERSION < 105100
// Please update your Boost installation (see www.boost.org for details).
#error HPX cannot be compiled with a Boost version earlier than 1.50.0
#error HPX cannot be compiled with a Boost version earlier than 1.51.0
#endif

#if BOOST_VERSION == 105400
Expand Down