Changeset View
Standalone View
plugins/clang/duchain/parsesession.cpp
| Show First 20 Lines • Show All 277 Lines • ▼ Show 20 Line(s) | 225 | #endif | |||
|---|---|---|---|---|---|
| 278 | 278 | | |||
| 279 | // libclang cannot find it's builtin dir automatically, we have to specify it manually | 279 | // libclang cannot find it's builtin dir automatically, we have to specify it manually | ||
| 280 | smartArgs << ClangHelpers::clangBuiltinIncludePath().toUtf8(); | 280 | smartArgs << ClangHelpers::clangBuiltinIncludePath().toUtf8(); | ||
| 281 | clangArguments << "-isystem" << smartArgs.last().constData(); | 281 | clangArguments << "-isystem" << smartArgs.last().constData(); | ||
| 282 | 282 | | |||
| 283 | smartArgs << writeDefinesFile(environment.defines()); | 283 | smartArgs << writeDefinesFile(environment.defines()); | ||
| 284 | clangArguments << "-imacros" << smartArgs.last().constData(); | 284 | clangArguments << "-imacros" << smartArgs.last().constData(); | ||
| 285 | 285 | | |||
| 286 | if (!environment.buildDirectory().isEmpty()) { | ||||
| 287 | QByteArray workingDirectory = environment.buildDirectory().toLocalFile().toUtf8(); | ||||
| 288 | workingDirectory.prepend("-working-directory"); | ||||
aaronpuchert: Is the build directory necessarily the working directory for compilation? | |||||
No, it is the working directory for the builder for the given project item. Technically, this is not necessarily the directory from which the builder will actually invoke the compiler (the build system could do some lookup, change directories, and run the compiler from there; e.g. recursive make setups could do something like that in theory). To get a better directory, it may be possible to add another method to the IBuildSystemManager like parserDirectory(ProjectBaseItem*) to allow the build system manager to give even more accurate information (to distinguish between the directory the builder is invoked and the directory in which the parser / compiler is invoked). That being said, the current cwd of the parser is the cwd of the kdevelop process (which is essentially random, so fixing this shouldn't break anything, unless someone is relying on the directory from which they launch kdevelop having an effect on how the parser resolves relative paths). Also, even the custommake plugin seems to try to make this sort of thing work as well as it can. However this does immediately fix an issue I am having, points out the need for this sort of information, and adds the framework for providing it. That being said, maybe that means this should be called the parseDirectory instead of build(er)Directory. bungeman: No, it is the working directory for the builder for the given project item. Technically, this… | |||||
Makes sense. This might not be perfect, but I agree it could improve some situations. We can do something more sophisticated should the need arise. I have also had cases where I needed to add include directories manually, perhaps because they were relative.
I would go with workingDirectory. Since the class is called ClangParsingEnvironment, the parse should be implied. aaronpuchert: Makes sense. This might not be perfect, but I agree it could improve some situations. We can do… | |||||
| 289 | smartArgs << workingDirectory; | ||||
| 290 | clangArguments << workingDirectory.constData(); | ||||
| 291 | } | ||||
| 292 | | ||||
| 286 | // append extra args from environment variable | 293 | // append extra args from environment variable | ||
| 287 | static const auto extraArgs = ::extraArgs(); | 294 | static const auto extraArgs = ::extraArgs(); | ||
| 288 | for (const QByteArray& arg : extraArgs) { | 295 | for (const QByteArray& arg : extraArgs) { | ||
| 289 | clangArguments << arg.constData(); | 296 | clangArguments << arg.constData(); | ||
| 290 | } | 297 | } | ||
| 291 | 298 | | |||
| 292 | QVector<CXUnsavedFile> unsaved; | 299 | QVector<CXUnsavedFile> unsaved; | ||
| 293 | //For PrecompiledHeader, we don't want unsaved contents (and contents.isEmpty()) | 300 | //For PrecompiledHeader, we don't want unsaved contents (and contents.isEmpty()) | ||
| ▲ Show 20 Lines • Show All 320 Lines • Show Last 20 Lines | |||||
Is the build directory necessarily the working directory for compilation?