diff options
| author | Szczepan Zalega <szczepan@nitrokey.com> | 2018-07-24 10:28:45 +0200 |
|---|---|---|
| committer | Szczepan Zalega <szczepan@nitrokey.com> | 2018-07-24 10:28:45 +0200 |
| commit | 2ebf30d87dc0b9bcc9488afab441e31044ec7ffa (patch) | |
| tree | 2b23fca870eacbab42191f2e696061ec1645fceb /unittest/catch_main.cpp | |
| parent | 6984151c61a85e10e93946f506b2f65b9dd9ec1b (diff) | |
| parent | 8de3f4d145c8f0321164afdcd1fa3d0e0c374e97 (diff) | |
| download | libnitrokey-2ebf30d87dc0b9bcc9488afab441e31044ec7ffa.tar.gz libnitrokey-2ebf30d87dc0b9bcc9488afab441e31044ec7ffa.tar.bz2 | |
Merge branch 'pr_132'
Update Catch to 2.3.0
Both CMake and Meson build files updated.
Tests compile (with both) and run with a Storage device.
Fixes #132
Diffstat (limited to 'unittest/catch_main.cpp')
| -rw-r--r-- | unittest/catch_main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/unittest/catch_main.cpp b/unittest/catch_main.cpp index 0ef4a4b..11a0a3a 100644 --- a/unittest/catch_main.cpp +++ b/unittest/catch_main.cpp @@ -20,4 +20,4 @@ */ #define CATCH_CONFIG_MAIN // This tells Catch to provide a main() -#include "catch.hpp"
\ No newline at end of file +#include "catch2/catch.hpp"
\ No newline at end of file |