diff --git a/wmake/rules/General/flex++ b/wmake/rules/General/flex++ index 9af740a96..aabf584fb 100644 --- a/wmake/rules/General/flex++ +++ b/wmake/rules/General/flex++ @@ -2,8 +2,8 @@ # For older versions of flex, the option --c++ is not avaliable # Switching to flex++ is an alternative -#Ltoo = flex++ -f $$SOURCE ; mv lex.yy.cc $*.C ; $(CC) $(c++FLAGS) -c $*.C -o $@ -Ltoo = flex -+ -f $$SOURCE ; mv lex.yy.cc $*.C ; $(CC) $(c++FLAGS) -c $*.C -o $@ +#Ltoo = flex++ -f $$SOURCE ; mv lex.yy.cc $*.C ; $(CC) $(c++FLAGS) $(c++LESSWARN) -c $*.C -o $@ +Ltoo = flex -+ -f $$SOURCE ; mv lex.yy.cc $*.C ; $(CC) $(c++FLAGS) $(c++LESSWARN) -c $*.C -o $@ .L.dep: $(MAKE_DEP) diff --git a/wmake/rules/SiCortex64Gcc/c++ b/wmake/rules/SiCortex64Gcc/c++ index dafa8f5c3..04ce02186 100644 --- a/wmake/rules/SiCortex64Gcc/c++ +++ b/wmake/rules/SiCortex64Gcc/c++ @@ -2,6 +2,9 @@ c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast +# Suppress some warnings for flex++ and CGAL +c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds + CC = g++ -mabi=64 #CC = scg++ -mabi=64 diff --git a/wmake/rules/SunOS64Gcc/c++ b/wmake/rules/SunOS64Gcc/c++ index 936a030ee..046f21c1e 100644 --- a/wmake/rules/SunOS64Gcc/c++ +++ b/wmake/rules/SunOS64Gcc/c++ @@ -2,6 +2,9 @@ c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast +# Suppress some warnings for flex++ and CGAL +c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds + CC = g++ -m64 include $(RULES)/c++$(WM_COMPILE_OPTION) diff --git a/wmake/rules/linux64Gcc/c++ b/wmake/rules/linux64Gcc/c++ index 2f00832b7..19e6f87ce 100644 --- a/wmake/rules/linux64Gcc/c++ +++ b/wmake/rules/linux64Gcc/c++ @@ -2,6 +2,9 @@ c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor +# Suppress some warnings for flex++ and CGAL +c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds + CC = g++ -std=c++11 -m64 include $(RULES)/c++$(WM_COMPILE_OPTION) diff --git a/wmake/rules/linux64Icc/c++ b/wmake/rules/linux64Icc/c++ index c8b3d7ca9..7f5906d90 100644 --- a/wmake/rules/linux64Icc/c++ +++ b/wmake/rules/linux64Icc/c++ @@ -2,6 +2,9 @@ c++WARN = -wd327,584,654,819,1125,1476,1505,1572 +# Suppress some warnings for flex++ and CGAL +c++LESSWARN = -diag-disable 1224,2026,2305 + CC = icpc -DIntel include $(RULES)/c++$(WM_COMPILE_OPTION) diff --git a/wmake/rules/linuxARM7Gcc/c++ b/wmake/rules/linuxARM7Gcc/c++ index f1f70ab80..381a65c60 100644 --- a/wmake/rules/linuxARM7Gcc/c++ +++ b/wmake/rules/linuxARM7Gcc/c++ @@ -2,6 +2,9 @@ c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast +# Suppress some warnings for flex++ and CGAL +c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds + CC = g++ -std=c++11 include $(RULES)/c++$(WM_COMPILE_OPTION) diff --git a/wmake/rules/linuxARM8Arm/c++ b/wmake/rules/linuxARM8Arm/c++ index fe83a320f..6333d9a4f 100644 --- a/wmake/rules/linuxARM8Arm/c++ +++ b/wmake/rules/linuxARM8Arm/c++ @@ -2,6 +2,9 @@ c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wno-undefined-var-template -Wno-deprecated-register -Wno-overloaded-virtual -Wno-null-dereference +# Suppress some warnings for flex++ and CGAL +c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds + CC = armclang++ -std=c++11 -DARM_CLANG include $(RULES)/c++$(WM_COMPILE_OPTION) diff --git a/wmake/rules/linuxARM8Gcc/c++ b/wmake/rules/linuxARM8Gcc/c++ index f1f70ab80..381a65c60 100644 --- a/wmake/rules/linuxARM8Gcc/c++ +++ b/wmake/rules/linuxARM8Gcc/c++ @@ -2,6 +2,9 @@ c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast +# Suppress some warnings for flex++ and CGAL +c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds + CC = g++ -std=c++11 include $(RULES)/c++$(WM_COMPILE_OPTION) diff --git a/wmake/rules/linuxGcc/c++ b/wmake/rules/linuxGcc/c++ index 9a972c577..f0ee56ac1 100644 --- a/wmake/rules/linuxGcc/c++ +++ b/wmake/rules/linuxGcc/c++ @@ -2,6 +2,9 @@ c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast +# Suppress some warnings for flex++ and CGAL +c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds + CC = g++ -std=c++11 -m32 include $(RULES)/c++$(WM_COMPILE_OPTION) diff --git a/wmake/rules/linuxIA64Gcc/c++ b/wmake/rules/linuxIA64Gcc/c++ index eaf8972e1..bf274ffba 100644 --- a/wmake/rules/linuxIA64Gcc/c++ +++ b/wmake/rules/linuxIA64Gcc/c++ @@ -2,6 +2,9 @@ c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast +# Suppress some warnings for flex++ and CGAL +c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds + CC = g++ -std=c++11 include $(RULES)/c++$(WM_COMPILE_OPTION) diff --git a/wmake/rules/linuxIA64I64/c++ b/wmake/rules/linuxIA64I64/c++ index a5a65d79d..269630818 100644 --- a/wmake/rules/linuxIA64I64/c++ +++ b/wmake/rules/linuxIA64I64/c++ @@ -2,6 +2,9 @@ c++WARN = -wd654,819,1125,1476,1505,1572 +# Suppress some warnings for flex++ and CGAL +c++LESSWARN = -diag-disable 1224,2026,2305 + CC = icpc -DIntel include $(RULES)/c++$(WM_COMPILE_OPTION) diff --git a/wmake/rules/linuxIA64Icc/c++ b/wmake/rules/linuxIA64Icc/c++ index 625cbd186..8b1afeeb0 100644 --- a/wmake/rules/linuxIA64Icc/c++ +++ b/wmake/rules/linuxIA64Icc/c++ @@ -2,6 +2,9 @@ c++WARN = -wd327,654,819,1125,1476,1505,1572 +# Suppress some warnings for flex++ and CGAL +c++LESSWARN = -diag-disable 1224,2026,2305 + CC = icpc include $(RULES)/c++$(WM_COMPILE_OPTION) diff --git a/wmake/rules/linuxIcc/c++ b/wmake/rules/linuxIcc/c++ index 8a3abc689..7dbc865df 100644 --- a/wmake/rules/linuxIcc/c++ +++ b/wmake/rules/linuxIcc/c++ @@ -2,6 +2,9 @@ c++WARN = -wd654 -wd1125 -vec-report0 +# Suppress some warnings for flex++ and CGAL +c++LESSWARN = -diag-disable 1224,2026,2305 + CC = icpc -DIntel include $(RULES)/c++$(WM_COMPILE_OPTION) diff --git a/wmake/rules/linuxPPC64Gcc/c++ b/wmake/rules/linuxPPC64Gcc/c++ index d8af9b25f..ed213f57e 100644 --- a/wmake/rules/linuxPPC64Gcc/c++ +++ b/wmake/rules/linuxPPC64Gcc/c++ @@ -2,6 +2,9 @@ c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast +# Suppress some warnings for flex++ and CGAL +c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds + CC = g++ -std=c++11 -m64 -mcpu=power5+ include $(RULES)/c++$(WM_COMPILE_OPTION) diff --git a/wmake/rules/mingwGcc/c++ b/wmake/rules/mingwGcc/c++ index a4c0fdfc2..fd754a354 100644 --- a/wmake/rules/mingwGcc/c++ +++ b/wmake/rules/mingwGcc/c++ @@ -2,6 +2,9 @@ c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor +# Suppress some warnings for flex++ and CGAL +c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds + CC = g++ -std=c++11 include $(RULES)/c++$(WM_COMPILE_OPTION) diff --git a/wmake/rules/solarisGcc/c++ b/wmake/rules/solarisGcc/c++ index 56edcd7a8..c790448d3 100644 --- a/wmake/rules/solarisGcc/c++ +++ b/wmake/rules/solarisGcc/c++ @@ -2,6 +2,9 @@ c++WARN = -Wall -Wextra -Wno-unused-parameter +# Suppress some warnings for flex++ and CGAL +c++LESSWARN = + CC = g++ -std=c++11 include $(RULES)/c++$(WM_COMPILE_OPTION)