Skip to content

Commit

Permalink
Merge branch 'boost_upgrade'
Browse files Browse the repository at this point in the history
(cherry picked from commit 7b52139)
  • Loading branch information
kaorut committed Apr 17, 2021
1 parent ce90fc0 commit 4ec314b
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/linux-clang.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ env:
CACHE_REV: 0
CONCURRENT_BUILD: 4
DOXYGEN_VER: 1.9.1
BOOST_VER: 1_75_0
BOOST_VER_DOT: 1.75.0
BOOST_VER: 1_76_0
BOOST_VER_DOT: 1.76.0

jobs:
build:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/linux-gcc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ on:
env:
CACHE_REV: 0
CONCURRENT_BUILD: 4
BOOST_VER: 1_75_0
BOOST_VER_DOT: 1.75.0
BOOST_VER: 1_76_0
BOOST_VER_DOT: 1.76.0

jobs:
build:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/windows-visualcpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ env:
CACHE_REV: 0
TETENGO_VER: 1.3.4
CONCURRENT_BUILD: 4
BOOST_VER: 1_75_0
BOOST_VER_DOT: 1.75.0
BOOST_VER: 1_76_0
BOOST_VER_DOT: 1.76.0

jobs:
build:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ How to Build and Install
#### Requirements

- [Visual Studio 2019](https://visualstudio.microsoft.com/)
- [Boost C++ libraries 1.75.0](https://www.boost.org/)
- [Boost C++ libraries 1.76.0](https://www.boost.org/)
- [Doxygen 1.9.1](https://www.doxygen.nl/)
- [Graphviz](https://www.graphviz.org/)
- [Python 3.7](https://www.python.org/),
Expand Down Expand Up @@ -123,7 +123,7 @@ Doxygen will output the documents into the directory `doc`.
[Clang 11.0.0](https://clang.llvm.org/),
[GCC 8.3.0](https://gcc.gnu.org/) or
[GCC 10.2.0](https://gcc.gnu.org/)
- [Boost C++ libraries 1.75.0](https://www.boost.org/)
- [Boost C++ libraries 1.76.0](https://www.boost.org/)
- [Doxygen 1.9.1](https://www.doxygen.nl/)
- [Graphviz](https://www.graphviz.org/)
- [include-what-you-use 0.11](https://include-what-you-use.org/) or
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ AC_SUBST([CFLAGS], "${CFLAGS} ${PTHREAD_CFLAGS}")
AC_SUBST([CXXFLAGS], "${CXXFLAGS} ${PTHREAD_CFLAGS}")
AC_SUBST([CC], "${PTHREAD_CC}")

AX_BOOST_BASE([1.75.0])
AX_BOOST_BASE([1.76.0])
AX_BOOST_UNIT_TEST_FRAMEWORK
AC_SUBST([LDFLAGS], "${LDFLAGS} ${BOOST_LDFLAGS}")
AC_SUBST([LIBS], "-lstdc++fs -lstdc++ ${LIBS}")
Expand Down

0 comments on commit 4ec314b

Please sign in to comment.