walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

dmake: force-add -std=c++0x if we compile with g++ or clang++

This commit is contained in:
Matthias Krüger 2015-11-10 21:07:06 +01:00
parent f92c448d6e
commit 11915f84e2
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -80,7 +80,13 @@ ifeq ($(CXX), clang++)
CPPCHK_GLIBCXX_DEBUG= CPPCHK_GLIBCXX_DEBUG=
endif endif
ifndef CXXFLAGS ifndef CXXFLAGS
CXXFLAGS=-std=c++0x -include lib/cxx11emu.h -pedantic -Wall -Wextra -Wabi -Wcast-qual -Wfloat-equal -Winline -Wmissing-declarations -Wmissing-format-attribute -Wno-long-long -Wpacked -Wredundant-decls -Wshadow -Wsign-promo -Wno-missing-field-initializers -Wno-missing-braces -Wno-sign-compare $(CPPCHK_GLIBCXX_DEBUG) -g CXXFLAGS=-include lib/cxx11emu.h -pedantic -Wall -Wextra -Wabi -Wcast-qual -Wfloat-equal -Winline -Wmissing-declarations -Wmissing-format-attribute -Wno-long-long -Wpacked -Wredundant-decls -Wshadow -Wsign-promo -Wno-missing-field-initializers -Wno-missing-braces -Wno-sign-compare $(CPPCHK_GLIBCXX_DEBUG) -g
endif
ifeq ($(CXX), g++)
override CXXFLAGS += -std=c++0x
else ifeq ($(CXX), clang++)
override CXXFLAGS += -std=c++0x
endif endif
ifeq ($(HAVE_RULES),yes) ifeq ($(HAVE_RULES),yes)

8
tools/dmake.cpp
View File

@ -328,7 +328,6 @@ int main(int argc, char **argv)
// -Wsign-conversion : too many warnings // -Wsign-conversion : too many warnings
// -Wunreachable-code : some GCC versions report lots of warnings // -Wunreachable-code : some GCC versions report lots of warnings
makeConditionalVariable(fout, "CXXFLAGS", makeConditionalVariable(fout, "CXXFLAGS",
"-std=c++0x "
"-include lib/cxx11emu.h " "-include lib/cxx11emu.h "
"-pedantic " "-pedantic "
"-Wall " "-Wall "
@ -356,6 +355,13 @@ int main(int argc, char **argv)
"-g"); "-g");
} }
fout << "ifeq ($(CXX), g++)\n"
<< " override CXXFLAGS += -std=c++0x\n"
<< "else ifeq ($(CXX), clang++)\n"
<< " override CXXFLAGS += -std=c++0x\n"
<< "endif\n"
<< "\n";
fout << "ifeq ($(HAVE_RULES),yes)\n" fout << "ifeq ($(HAVE_RULES),yes)\n"
<< " CXXFLAGS += -DHAVE_RULES -DTIXML_USE_STL $(shell pcre-config --cflags)\n" << " CXXFLAGS += -DHAVE_RULES -DTIXML_USE_STL $(shell pcre-config --cflags)\n"
<< " ifdef LIBS\n" << " ifdef LIBS\n"