Skip to content

Commit

Permalink
Update doctest from 2.4.3 to 2.4.5 and document bug in 2.4.6, closes #…
Browse files Browse the repository at this point in the history
  • Loading branch information
Dobiasd committed Nov 29, 2021
1 parent f649202 commit 09726e8
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ tests requires [doctest](https://github.com/onqtam/doctest).

Install doctest:
```bash
git clone --depth=1 --branch=2.4.3 https://github.com/onqtam/doctest
git clone --depth=1 --branch=2.4.5 https://github.com/onqtam/doctest # 2.4.6 has a bug, see https://github.com/Dobiasd/FunctionalPlus/issues/250
cmake -S doctest -B doctest/build -DDOCTEST_WITH_TESTS=OFF -DDOCTEST_WITH_MAIN_IN_STATIC_LIB=OFF
cmake --build doctest/build -j 4
sudo cmake --install doctest/build
Expand All @@ -55,7 +55,7 @@ As an alternative, doctest global installation can be skipped by installing to
a local prefix:

````bash
git clone --depth=1 --branch=2.4.3 https://github.com/onqtam/doctest
git clone --depth=1 --branch=2.4.5 https://github.com/onqtam/doctest
cmake -S doctest -B doctest/build -DDOCTEST_WITH_TESTS=OFF -DDOCTEST_WITH_MAIN_IN_STATIC_LIB=OFF
cmake --build doctest/build
cmake --install doctest/build --prefix doctest
Expand Down
2 changes: 1 addition & 1 deletion conanfile.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[requires]
doctest/2.4.3
doctest/2.4.5

[generators]
cmake_find_package
Expand Down
2 changes: 1 addition & 1 deletion script/ci_setup_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@


## Install doctest
git clone --depth=1 --branch=2.4.3 https://github.com/onqtam/doctest
git clone --depth=1 --branch=2.4.5 https://github.com/onqtam/doctest
cd doctest && mkdir -p build && cd build
cmake .. -DDOCTEST_WITH_TESTS=OFF -DDOCTEST_WITH_MAIN_IN_STATIC_LIB=OFF
cmake --build . --config Release --target install
2 changes: 1 addition & 1 deletion test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ set(
include(../cmake/root-project.cmake)
include(../cmake/warnings.cmake)

find_package(doctest 2.4.3 CONFIG REQUIRED)
find_package(doctest 2.4.5 CONFIG REQUIRED)
# for doctest_discover_tests
include(doctest)

Expand Down

0 comments on commit 09726e8

Please sign in to comment.