Update to Catch2.

This commit is contained in:
King_DuckZ 2018-07-29 10:59:49 +01:00
parent 7c973896d7
commit ab74f8ab3a
8 changed files with 9 additions and 9 deletions

6
.gitmodules vendored
View file

@ -1,6 +1,6 @@
[submodule "lib/sprout"]
path = lib/sprout
url = ../../bolero-MURAKAMI/Sprout.git
[submodule "lib/Catch"]
path = lib/Catch
url = https://github.com/philsquared/Catch.git
[submodule "lib/Catch2"]
path = lib/Catch2
url = https://github.com/catchorg/Catch2.git

@ -1 +0,0 @@
Subproject commit ac369b7b8362de7ccc9c3f46e4f0c59115ecadcc

1
lib/Catch2 Submodule

@ -0,0 +1 @@
Subproject commit c9de7dd12d2971c63f9d32ce5459eb98f2fec13d

View file

@ -10,7 +10,7 @@ set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 17)
set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
target_include_directories(${PROJECT_NAME}
PRIVATE ${DUCKHANDY_SOURCE_DIR}/lib/Catch/single_include
PRIVATE ${DUCKHANDY_SOURCE_DIR}/lib/Catch2/single_include
)
target_link_libraries(${PROJECT_NAME}

View file

@ -15,7 +15,7 @@
* along with "duckhandy". If not, see <http://www.gnu.org/licenses/>.
*/
#include "catch.hpp"
#include "catch2/catch.hpp"
#include "duckhandy/endianness.hpp"
#include <endian.h>

View file

@ -15,7 +15,7 @@
* along with "duckhandy". If not, see <http://www.gnu.org/licenses/>.
*/
#include "catch.hpp"
#include "catch2/catch.hpp"
#include "duckhandy/int_conv.hpp"
#include "duckhandy/string_bt.hpp"
#include "sprout/cstring/strlen.hpp"

View file

@ -15,7 +15,7 @@
* along with "duckhandy". If not, see <http://www.gnu.org/licenses/>.
*/
#include "catch.hpp"
#include "catch2/catch.hpp"
#include "duckhandy/lexical_cast.hpp"
#include "duckhandy/int_to_string_ary.hpp"
#include <cstdint>

View file

@ -16,4 +16,4 @@
*/
#define CATCH_CONFIG_MAIN
#include "catch.hpp"
#include "catch2/catch.hpp"