From e8f8f4668debfb0edf2632a8bf7348ccdeeb1577 Mon Sep 17 00:00:00 2001 From: danielque Date: Thu, 18 May 2017 14:08:33 +0200 Subject: [PATCH] disable some warnings in make options for compressible use the default 7 hexadecimal digits as the abbreviated object name; disable warnings about old-style casts, unused results and literal suffix, since they are of little interest and mostly caused by external libraries (mpi, c/c++ standard libraries) (same as in 80aaf69748d5b619111893e0cad2cd5b8393ad98 and 9e478e23a63c31e038956c72646a83bf2c68955e) --- src/lagrangian/cfdemParticleComp/Make/options | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/lagrangian/cfdemParticleComp/Make/options b/src/lagrangian/cfdemParticleComp/Make/options index e79a9574..a7718b58 100644 --- a/src/lagrangian/cfdemParticleComp/Make/options +++ b/src/lagrangian/cfdemParticleComp/Make/options @@ -4,7 +4,7 @@ sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB) sinclude $(RULES)/mplib$(WM_MPLIB) -GIT_VERSION := $(shell git describe --abbrev=4 --dirty --always --tags) +GIT_VERSION := $(shell git describe --dirty --always --tags) PFLAGS+= -DGITVERSION=\"$(GIT_VERSION)\" PFLAGS+= -Dcompre @@ -24,6 +24,9 @@ EXE_INC = \ -I$(CFDEM_LIGGGHTS_SRC_DIR) \ -I$(CFDEM_M2MLIB_PATH) \ -I$(CFDEM_SRC_DIR)/cfdTools \ + -Wno-old-style-cast \ + -Wno-unused-result \ + -Wno-literal-suffix LIB_LIBS = \ $(PLIBS) \