diff --git a/.github/workflows/clang.yml b/.github/workflows/clang.yml index b9bb5fc1..a11f5178 100644 --- a/.github/workflows/clang.yml +++ b/.github/workflows/clang.yml @@ -43,6 +43,7 @@ jobs: cd vcpkg ./bootstrap-vcpkg.sh ./vcpkg install catch2 + ./vcpkg install fmt - name: Create Build Environment run: cmake -E make_directory ${{runner.workspace}}/build diff --git a/.github/workflows/gcc.yml b/.github/workflows/gcc.yml index 26cb0ff8..7ad5b61c 100644 --- a/.github/workflows/gcc.yml +++ b/.github/workflows/gcc.yml @@ -39,6 +39,7 @@ jobs: cd vcpkg ./bootstrap-vcpkg.sh ./vcpkg install catch2 + ./vcpkg install fmt - name: Create Build Environment run: cmake -E make_directory ${{runner.workspace}}/build diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml index 55997ad7..9d66102b 100644 --- a/.github/workflows/msvc.yml +++ b/.github/workflows/msvc.yml @@ -35,6 +35,8 @@ jobs: vcpkg install boost-algorithm:x64-windows vcpkg install boost-date-time:x64-windows vcpkg install catch2:x64-windows + vcpkg install fmt:x64-windows + vcpkg install nlohmann-json:x64-windows vcpkg integrate install - name: Create Build Environment diff --git a/README.md b/README.md index e2c431a8..4599c985 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![codecov](https://codecov.io/gh/MichaelMiller-/sec21/branch/master/graph/badge.svg?token=f7vlTsHZWl)](https://codecov.io/gh/MichaelMiller-/sec21) [![CodeQL](https://github.com/MichaelMiller-/sec21/actions/workflows/codeql.yml/badge.svg)](https://github.com/MichaelMiller-/sec21/actions/workflows/codeql.yml) -**sec21** is a collection of useful functions and classes and the boilerplate for a lot of my projects. +**sec21** is a collection of useful functions and classes, also the boilerplate for a lot of my projects. ## Documentation See the [Wiki](https://github.com/MichaelMiller-/sec21/wiki) for the full documentation, examples, operational details and other information. diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index f1c501cd..a3bedbae 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,5 +1,7 @@ find_package(Catch2 CONFIG REQUIRED) find_package(Boost 1.70 REQUIRED) +find_package(fmt REQUIRED) +find_package(nlohmann_json CONFIG REQUIRED) ## speed up the compile-time process add_library(catch_main STATIC catch_main.cpp) @@ -15,6 +17,8 @@ function(test filename) target_link_libraries(${test_project_name} PRIVATE catch_main) target_link_libraries(${test_project_name} PRIVATE sec21::sec21) target_link_libraries(${test_project_name} PRIVATE enable_compiler_warnings) + target_link_libraries(${test_project_name} PRIVATE fmt::fmt-header-only) + target_link_libraries(${test_project_name} PRIVATE nlohmann_json nlohmann_json::nlohmann_json) add_test( NAME ${test_project_name}