diff options
| author | Brad King <brad.king@kitware.com> | 2021-07-02 10:14:36 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-07-02 10:14:36 -0400 |
| commit | 77abc295a10bd3bd8e0bdea7a2254d6c506ee930 (patch) | |
| tree | 12a340462fe5feb9db32a03e8627caea0f0ca41d | |
| parent | efa5e1f367ac76cb7aa919929ece1f4799cdc4b2 (diff) | |
| parent | 6a6efdcaedc6f87fbafd40af5305cabdced450c4 (diff) | |
| download | cmake-77abc295a10bd3bd8e0bdea7a2254d6c506ee930.tar.gz | |
Merge branch 'backport-3.20-makefile-normalize-depfile' into release-3.20
Merge-request: !6297
| -rw-r--r-- | Source/cmDependsCompiler.cxx | 4 | ||||
| -rw-r--r-- | Source/cmGccDepfileReader.cxx | 8 | ||||
| -rw-r--r-- | Source/cmGccDepfileReader.h | 11 |
3 files changed, 17 insertions, 6 deletions
diff --git a/Source/cmDependsCompiler.cxx b/Source/cmDependsCompiler.cxx index 2b48df9693..09f55997bf 100644 --- a/Source/cmDependsCompiler.cxx +++ b/Source/cmDependsCompiler.cxx @@ -131,7 +131,9 @@ bool cmDependsCompiler::CheckDependencies( depends.emplace_back(std::move(line)); } } else if (format == "gcc"_s) { - auto deps = cmReadGccDepfile(depFile.c_str()); + auto deps = cmReadGccDepfile( + depFile.c_str(), this->LocalGenerator->GetCurrentBinaryDirectory(), + GccDepfilePrependPaths::Deps); if (!deps) { continue; } diff --git a/Source/cmGccDepfileReader.cxx b/Source/cmGccDepfileReader.cxx index 6436baac87..d30dbc3090 100644 --- a/Source/cmGccDepfileReader.cxx +++ b/Source/cmGccDepfileReader.cxx @@ -12,8 +12,9 @@ #include "cmStringAlgorithms.h" #include "cmSystemTools.h" -cm::optional<cmGccDepfileContent> cmReadGccDepfile(const char* filePath, - const std::string& prefix) +cm::optional<cmGccDepfileContent> cmReadGccDepfile( + const char* filePath, const std::string& prefix, + GccDepfilePrependPaths prependPaths) { cmGccDepfileLexerHelper helper; if (!helper.readFile(filePath)) { @@ -23,7 +24,8 @@ cm::optional<cmGccDepfileContent> cmReadGccDepfile(const char* filePath, for (auto& dep : *deps) { for (auto& rule : dep.rules) { - if (!prefix.empty() && !cmSystemTools::FileIsFullPath(rule)) { + if (prependPaths == GccDepfilePrependPaths::All && !prefix.empty() && + !cmSystemTools::FileIsFullPath(rule)) { rule = cmStrCat(prefix, '/', rule); } if (cmSystemTools::FileIsFullPath(rule)) { diff --git a/Source/cmGccDepfileReader.h b/Source/cmGccDepfileReader.h index c8a37485c7..2433492446 100644 --- a/Source/cmGccDepfileReader.h +++ b/Source/cmGccDepfileReader.h @@ -8,8 +8,15 @@ #include "cmGccDepfileReaderTypes.h" +enum class GccDepfilePrependPaths +{ + All, + Deps, +}; + /* - * Read dependencies file and append prefix to all relative paths + * Read dependencies file and prepend prefix to all relative paths */ cm::optional<cmGccDepfileContent> cmReadGccDepfile( - const char* filePath, const std::string& prefix = {}); + const char* filePath, const std::string& prefix = {}, + GccDepfilePrependPaths prependPaths = GccDepfilePrependPaths::All); |