Skip to content

Commit 2f6d280

Browse files
committed
rm boost from cmake/docs
1 parent 9d42a9c commit 2f6d280

File tree

5 files changed

+6
-37
lines changed

5 files changed

+6
-37
lines changed

BUILDING.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ Core:
4040
Optional:
4141

4242
- __hwloc__ - see [below](#hwloc).
43-
- __boost-atomic__ - recommended for performance if using the clang compiler.
4443

4544
Docs:
4645

@@ -73,7 +72,7 @@ The easiest way to manage libfork's main dependencies (some of which are require
7372
-DCMAKE_TOOLCHAIN_FILE=<path to vcpkg>/scripts/buildsystems/vcpkg.cmake -DVCPKG_MANIFEST_FEATURES="<features>"
7473
```
7574

76-
where `<path to vcpkg>` is the path to your vcpkg installation and ``<features>`` is a colon-separated list of one or more of the available features: `test`, `benchmark`, `boost` and, `hwloc`. The `test` and `benchmark` features include the dependencies __required__ for the test and benchmark suits respectively. Alternatively, the `boost` and `hwloc` features are recommended - but optional - dependencies.
75+
where `<path to vcpkg>` is the path to your vcpkg installation and ``<features>`` is a colon-separated list of one or more of the available features: `test`, `benchmark` and, `hwloc`. The `test` and `benchmark` features include the dependencies __required__ for the test and benchmark suits respectively. Alternatively, the `hwloc` feature is a recommended - but optional - dependency.
7776

7877
#### Hwloc
7978

CMakeLists.txt

+5-20
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ read_version(${CMAKE_CURRENT_SOURCE_DIR}/include/libfork/core/macro.hpp)
1010
project(
1111
libfork
1212
VERSION ${version_major}.${version_minor}.${version_patch}
13-
DESCRIPTION "A bleeding-edge, lock-free, wait-free, continuation-stealing fork-join library built on C++20's coroutines."
13+
DESCRIPTION
14+
"A bleeding-edge, lock-free, wait-free, continuation-stealing fork-join library built on C++20's coroutines."
1415
HOMEPAGE_URL "https://github.com/ConorWilliams/libfork"
1516
LANGUAGES CXX C
1617
)
@@ -55,17 +56,17 @@ if(LF_COROUTINE_OFFSET)
5556
target_compile_definitions(libfork_libfork INTERFACE LF_COROUTINE_OFFSET=${LF_COROUTINE_OFFSET})
5657
endif()
5758

58-
# --------------- Optional dependancies---------------
59+
# --------------- Optional dependancies---------------
5960

60-
# ---------------- hwloc----------------
61+
# ---------------- hwloc----------------
6162

6263
option(LF_NO_HWLOC "Disable hwloc support" OFF)
6364

6465
if(NOT LF_NO_HWLOC)
6566
# Conan exports a proper target for hwloc, vcpkg does not.
6667
find_package(hwloc 2.5.0 QUIET)
6768

68-
if (hwloc_FOUND)
69+
if(hwloc_FOUND)
6970
# Instructs libfork to use hwloc.
7071
target_compile_definitions(libfork_libfork INTERFACE LF_USE_HWLOC)
7172
# Link to exported target.
@@ -89,22 +90,6 @@ if(NOT LF_NO_HWLOC)
8990
endif()
9091
endif()
9192

92-
# ---- Boost (for clang acceleration) ----
93-
94-
option(LF_NO_BOOST_ATOMIC "Libfork will use std::atomic even if boost is found" OFF)
95-
96-
if(NOT LF_NO_BOOST_ATOMIC)
97-
98-
find_package(Boost 1.83.0 COMPONENTS atomic)
99-
100-
if(Boost_FOUND)
101-
# Instructs libfork to use boost atomic (clang only)
102-
target_compile_definitions(libfork_libfork INTERFACE LF_USE_BOOST_ATOMIC)
103-
104-
target_link_libraries(libfork_libfork INTERFACE Boost::atomic)
105-
endif()
106-
endif()
107-
10893
# ---- Install rules ----
10994

11095
if(NOT CMAKE_SKIP_INSTALL_RULES)

cmake/install-config.cmake.in

-4
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,4 @@ if (@hwloc_FOUND@)
88
find_dependency(hwloc 2.5.0)
99
endif()
1010

11-
if (NOT @LF_NO_BOOST_ATOMIC@)
12-
find_dependency(Boost 1.83.0 COMPONENTS atomic)
13-
endif()
14-
1511
include("${CMAKE_CURRENT_LIST_DIR}/libforkTargets.cmake")

conanfile.py

-2
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ def build_requirements(self):
6262
# Some traits like build=True, etc.. will be automatically inferred.
6363
self.tool_requires("cmake/3.28.1")
6464
# Optional dependencies that boost performance.
65-
self.requires("boost/1.83.0")
6665
self.requires("hwloc/2.9.3")
6766

6867
def layout(self):
@@ -99,5 +98,4 @@ def package_info(self):
9998
# Let libfork know about the optional dependencies.
10099
self.cpp_info.defines = [
101100
"LF_USE_HWLOC",
102-
"LF_USE_BOOST_ATOMIC",
103101
]

vcpkg.json

-9
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,6 @@
1111
}
1212
]
1313
},
14-
"boost": {
15-
"description": "This an OPTIONAL dependency, fetches a modern boost-atomic to make up for clangs bad std::atomic codegen, this is recommended for clang users, it is recommended to use the system distribution if available.",
16-
"dependencies": [
17-
{
18-
"name": "boost-atomic",
19-
"version>=": "1.83.0"
20-
}
21-
]
22-
},
2314
"test": {
2415
"description": "These are libfork's test-suite dependencies.",
2516
"dependencies": [

0 commit comments

Comments
 (0)