Supply c++11 flags and per-project info to c++ code model.
A manual squash/merge of the changes below, plus a couple of subsequent
code fixes.
59085aa5fbb99e2d786cd2c1a06c24a111ccb49f:
Modify CppModel::ProjectInfo
Adding per project node information, to pass on the correct
defines/includes for each file, instead of aggregating them incorrectly.
Also split up SOURCES and OBJECTIVE_SOURCES.
Also ask the toolchain to convert the compilerflags to flags the
codemodel understands, for now only gcc and only c++11.
Also make the toolchain aware of the flags used to compile, so that it
can emit the correct defines.
Note: No header files are passed on.
74028802314cd4e75b41b46407433e07090a304d:
GCC: Evaluate cxxflags when checking for predefined macros
ebaaa4957e4c02cc9637a998eddae1d0acd74f83:
MSVC: Take cxxflags into account when checking for predefined macros
9bfce7e889bcf7bcc47bf880e3ea25945ca7d0d7:
Compile fixes
Change-Id: I9de94ad038dfc5dc1987732e84b13fb4419c96f5
Reviewed-by:
Erik Verbruggen <erik.verbruggen@nokia.com>
Showing
- src/libs/cplusplus/ModelManagerInterface.cpp 43 additions, 0 deletionssrc/libs/cplusplus/ModelManagerInterface.cpp
- src/libs/cplusplus/ModelManagerInterface.h 75 additions, 13 deletionssrc/libs/cplusplus/ModelManagerInterface.h
- src/plugins/autotoolsprojectmanager/autotoolsproject.cpp 15 additions, 11 deletionssrc/plugins/autotoolsprojectmanager/autotoolsproject.cpp
- src/plugins/cmakeprojectmanager/cmakeproject.cpp 14 additions, 9 deletionssrc/plugins/cmakeprojectmanager/cmakeproject.cpp
- src/plugins/cppeditor/cppquickfixes.cpp 9 additions, 5 deletionssrc/plugins/cppeditor/cppquickfixes.cpp
- src/plugins/cpptools/cppcompletionsupport.cpp 2 additions, 2 deletionssrc/plugins/cpptools/cppcompletionsupport.cpp
- src/plugins/cpptools/cppmodelmanager.cpp 90 additions, 5 deletionssrc/plugins/cpptools/cppmodelmanager.cpp
- src/plugins/cpptools/cppmodelmanager.h 4 additions, 1 deletionsrc/plugins/cpptools/cppmodelmanager.h
- src/plugins/cpptools/cpptoolsreuse.cpp 17 additions, 4 deletionssrc/plugins/cpptools/cpptoolsreuse.cpp
- src/plugins/cpptools/cpptoolsreuse.h 1 addition, 0 deletionssrc/plugins/cpptools/cpptoolsreuse.h
- src/plugins/genericprojectmanager/genericproject.cpp 14 additions, 9 deletionssrc/plugins/genericprojectmanager/genericproject.cpp
- src/plugins/projectexplorer/abstractmsvctoolchain.cpp 12 additions, 4 deletionssrc/plugins/projectexplorer/abstractmsvctoolchain.cpp
- src/plugins/projectexplorer/abstractmsvctoolchain.h 5 additions, 3 deletionssrc/plugins/projectexplorer/abstractmsvctoolchain.h
- src/plugins/projectexplorer/gcctoolchain.cpp 39 additions, 6 deletionssrc/plugins/projectexplorer/gcctoolchain.cpp
- src/plugins/projectexplorer/gcctoolchain.h 3 additions, 1 deletionsrc/plugins/projectexplorer/gcctoolchain.h
- src/plugins/projectexplorer/msvctoolchain.cpp 38 additions, 12 deletionssrc/plugins/projectexplorer/msvctoolchain.cpp
- src/plugins/projectexplorer/msvctoolchain.h 2 additions, 1 deletionsrc/plugins/projectexplorer/msvctoolchain.h
- src/plugins/projectexplorer/toolchain.h 7 additions, 1 deletionsrc/plugins/projectexplorer/toolchain.h
- src/plugins/qt4projectmanager/qt-s60/gccetoolchain.cpp 2 additions, 2 deletionssrc/plugins/qt4projectmanager/qt-s60/gccetoolchain.cpp
- src/plugins/qt4projectmanager/qt-s60/gccetoolchain.h 1 addition, 1 deletionsrc/plugins/qt4projectmanager/qt-s60/gccetoolchain.h
Loading
Please register or sign in to comment