Skip to content

Commit e4ff5c4

Browse files
authored
Merge pull request #637 from bennibbelink/boost-1.86
2 parents ce67519 + 7381267 commit e4ff5c4

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

CHANGELOG.rst

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Since last release
1010
* Added package parameter to source (#613, #617, #621, #623, #630)
1111
* Added default keep packaging to reactor (#618, #619)
1212
* Added support for Ubuntu 24.04 (#633)
13-
* Added (negative)binomial distributions for disruption modeling to storage (#635)
13+
* Added (negative)binomial distributions for disruption modeling to storage (#635)
1414

1515
**Changed:**
1616

@@ -27,6 +27,7 @@ Since last release
2727
* Schedule Decommission in ``Reactor::Tick()`` instead of Decommission (#609)
2828
* When trades fail in Source due to packaging, send empty material instead of seg faulting (#629)
2929
* Logging of resource moves between ResBufs in Storage is INFO4 not INFO1 (#625)
30+
* Support Boost>=1.86.0 (#637)
3031

3132
**Removed:**
3233

@@ -43,10 +44,10 @@ v1.6.0
4344
* GitHub workflow for publishing images and debian packages on release (#573, #582, #583, #593)
4445
* GitHub workflows for building/testing on a PR and push to `main` (#549, #564, #573, #582, #583, #590)
4546
* Add functionality for random behavior on the size (#550) and frequency (#565) of a sink
46-
* GitHub workflow to check that the CHANGELOG has been updated (#562)
47+
* GitHub workflow to check that the CHANGELOG has been updated (#562)
4748
* Added inventory policies to Storage through the material buy policy (#574, #588)
4849

49-
**Changed:**
50+
**Changed:**
5051

5152
* Updated build procedure to use newer versions of packages and compilers in 2023 (#549, #596, #599)
5253
* Added active/dormant and request size variation from buy policy to Storage (#546, #568, #586, #587)
@@ -72,12 +73,12 @@ v1.5.4
7273

7374
* RecordTimeSeries has been added to the several archetypes; Reactor, Source, Sink,
7475
FuelFab, Separations, and Storage. This change was made to allow these agents to
75-
interact with the d3ploy archetypes.
76+
interact with the d3ploy archetypes.
7677
* Added unit tests for Cycamore archetypes with Position toolkit.
7778

7879
* Record function for Cycamore archetypes' coordinates in Sqlite Output.
7980

80-
**Changed:**
81+
**Changed:**
8182

8283
- All cycamore archetypes have been edited to now include Cyclus::toolkit::Position.
8384

@@ -88,7 +89,3 @@ v1.5.3
8889
**Changed:**
8990

9091
* Many build system improvements, including making COIN optional.
91-
92-
93-
94-

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ IF(NOT CYCLUS_DOC_ONLY)
9393
MESSAGE("-- Boost Filesystem location: ${Boost_FILESYSTEM_LIBRARY}")
9494
SET(LIBS ${LIBS} ${Boost_SERIALIZATION_LIBRARY})
9595
MESSAGE("-- Boost Serialization location: ${Boost_SERIALIZATION_LIBRARY}")
96+
ADD_DEFINITIONS(-DBOOST_VERSION_MINOR=${Boost_VERSION_MINOR})
9697

9798
# find lapack and link to it
9899
# note there is no include directory variable:

0 commit comments

Comments
 (0)