From e91b74655edb9cfe7902bcf0c3e0964cf1da68ab Mon Sep 17 00:00:00 2001 From: - <-> Date: Thu, 23 Mar 2023 00:05:59 -0700 Subject: [PATCH] Addressed compilation errors for test recipe. --- Makefile | 27 ++++++++++++++++++++++++++- lib/Catch | 2 +- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3c83b7b..6f9d336 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ EX=reflex2q3 CC=g++ -CFLAGS=-static -static-libgcc -static-libstdc++ -I"/mingw64/include/eigen3" -I"include" -I"lib/Catch/single_include" -I"lib/cxxopts/include" -I"/usr/include/eigen3" +CFLAGS=-static -static-libgcc -static-libstdc++ -I"/mingw64/include/eigen3" -I"include" -I"lib/Catch/single_include/catch2" -I"lib/cxxopts/include" -I"/usr/include/eigen3" TESTEX=runtests all: main test @@ -30,3 +30,28 @@ EntityConverter.o: src/EntityConverter.cpp clean: rm *.o $(EX) +# From https://github.com/philsquared/Catch +# 64a53355..908c370f Catch1.x -> origin/Catch1.x +# * [new branch] devel -> origin/devel +# * [new branch] devel-refactorings-virtuals -> origin/devel-refactorings-virtuals +# * [new branch] v2.x -> origin/v2.x +# * [new tag] v2.13.10 -> v2.13.10 +# * [new tag] v2.13.2 -> v2.13.2 +# * [new tag] v2.13.3 -> v2.13.3 +# * [new tag] v2.13.4 -> v2.13.4 +# * [new tag] v2.13.5 -> v2.13.5 +# * [new tag] v2.13.6 -> v2.13.6 +# * [new tag] v2.13.7 -> v2.13.7 +# * [new tag] v2.13.8 -> v2.13.8 +# * [new tag] v2.13.9 -> v2.13.9 +# * [new tag] v3.0.0-preview3 -> v3.0.0-preview3 +# * [new tag] v3.0.0-preview4 -> v3.0.0-preview4 +# * [new tag] v3.0.0-preview5 -> v3.0.0-preview5 +# * [new tag] v3.0.1 -> v3.0.1 +# * [new tag] v3.1.0 -> v3.1.0 +# * [new tag] v3.1.1 -> v3.1.1 +# * [new tag] v3.2.0 -> v3.2.0 +# * [new tag] v3.2.1 -> v3.2.1 +# * [new tag] v3.3.0 -> v3.3.0 +# * [new tag] v3.3.1 -> v3.3.1 +# * [new tag] v3.3.2 -> v3.3.2 diff --git a/lib/Catch b/lib/Catch index d2d8455..182c910 160000 --- a/lib/Catch +++ b/lib/Catch @@ -1 +1 @@ -Subproject commit d2d8455b571b6c66c4b7003500a77f9a93ecdc28 +Subproject commit 182c910b4b63ff587a3440e08f84f70497e49a81