From 1edff137f6be3c28b31d6ab78f48b22bc791155c Mon Sep 17 00:00:00 2001 From: BenLangmead Date: Sun, 4 Oct 2015 19:18:02 -0400 Subject: [PATCH 1/2] compile will now work even in environment without omp.h --- src/Makefile | 5 ++++- src/kraken_headers.hpp | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Makefile b/src/Makefile index 2f927f6..5a5a39a 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,5 +1,8 @@ CXX = g++ -CXXFLAGS = -Wall -fopenmp -O3 +CXXFLAGS = -Wall -O3 +ifeq (1,$(WITH_OMP)) + CXXFLAGS += -fopenmp +endif PROGS = db_sort set_lcas classify make_seqid_to_taxid_map db_shrink .PHONY: all install clean diff --git a/src/kraken_headers.hpp b/src/kraken_headers.hpp index bca9858..8117d4a 100644 --- a/src/kraken_headers.hpp +++ b/src/kraken_headers.hpp @@ -33,7 +33,9 @@ #include #include #include +#ifdef _OPENMP #include +#endif #include #include #include From 8e1f0de21e971c361fd19cb5cad56915fd6ff3a2 Mon Sep 17 00:00:00 2001 From: BenLangmead Date: Sun, 4 Oct 2015 19:18:49 -0400 Subject: [PATCH 2/2] adding gitignore for object files --- src/.gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/.gitignore diff --git a/src/.gitignore b/src/.gitignore new file mode 100644 index 0000000..1530978 --- /dev/null +++ b/src/.gitignore @@ -0,0 +1 @@ +*.o \ No newline at end of file