diff options
| author | Pjotr Prins | 2023-06-18 15:12:39 +0200 |
|---|---|---|
| committer | Pjotr Prins | 2023-06-18 15:12:39 +0200 |
| commit | 9020d4efddb6f4e8586292c31219eea9ac93876e (patch) | |
| tree | aba315dd8b76b14b721b5c220ac5c2a2159b6104 | |
| parent | d29c7d5f6f01b1ed9c6c94a3c3776883fcc96059 (diff) | |
| download | pangemma-9020d4efddb6f4e8586292c31219eea9ac93876e.tar.gz | |
Remove catch.hpp and use the one from the distro
| -rw-r--r-- | Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile index b0b7750..f3cc024 100644 --- a/Makefile +++ b/Makefile @@ -141,13 +141,13 @@ ifneq ($(CXX), clang++) debug check fast-check: CPPFLAGS += -Og -Wfatal-errors endif -debug check fast-check: CPPFLAGS += -g $(GCC_FLAGS) $(GSL_INCLUDE_PATH) -Icontrib/catch-1.9.7 -Isrc +debug check fast-check: CPPFLAGS += -g $(GCC_FLAGS) $(GSL_INCLUDE_PATH) -Isrc -profile: CPPFLAGS += -g $(GCC_FLAGS) $(GSL_INCLUDE_PATH) -Icontrib/catch-1.9.7 -Isrc +profile: CPPFLAGS += -g $(GCC_FLAGS) $(GSL_INCLUDE_PATH) -Isrc -release: CPPFLAGS += -DNDEBUG -O3 $(GCC_FLAGS) $(GSL_INCLUDE_PATH) -Icontrib/catch-1.9.7 -Isrc +release: CPPFLAGS += -DNDEBUG -O3 $(GCC_FLAGS) $(GSL_INCLUDE_PATH) -Isrc -static: CPPFLAGS += -DNDEBUG -O3 $(GCC_FLAGS) $(GSL_INCLUDE_PATH) -Icontrib/catch-1.9.7 -Isrc +static: CPPFLAGS += -DNDEBUG -O3 $(GCC_FLAGS) $(GSL_INCLUDE_PATH) -Isrc ifeq ($(SYS), WIN) @@ -227,7 +227,7 @@ $(OBJS): $(HDR) .SUFFIXES : .cpp .c .o $(SUFFIXES) -./bin/unittests-gemma: contrib/catch-1.9.7/catch.hpp $(TEST_SRC_DIR)/unittests-main.o $(TEST_SRC_DIR)/unittests-math.o $(OBJS) +./bin/unittests-gemma: $(TEST_SRC_DIR)/unittests-main.o $(TEST_SRC_DIR)/unittests-math.o $(OBJS) $(CPP) $(CPPFLAGS) $(TEST_SRC_DIR)/unittests-main.o $(TEST_SRC_DIR)/unittests-math.o $(filter-out src/main.o, $(OBJS)) $(LIBS) -o ./bin/unittests-gemma unittests: all ./bin/unittests-gemma |