diff options
| author | David Cole <david.cole@kitware.com> | 2012-03-27 19:56:13 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-03-27 19:56:13 (GMT) |
| commit | ef309e94cb85d359db3cbf0aac3e7e290a0125f0 (patch) | |
| tree | 0153a775848b86a7b4ee4b4ff23597051fcef11c | |
| parent | 77ec098b44ea036078a574754b6c935837a2fd75 (diff) | |
| parent | 6b5614f1642dcb75fd9de9571c813b21e4f9ce2b (diff) | |
| download | CMake-ef309e94cb85d359db3cbf0aac3e7e290a0125f0.zip CMake-ef309e94cb85d359db3cbf0aac3e7e290a0125f0.tar.gz CMake-ef309e94cb85d359db3cbf0aac3e7e290a0125f0.tar.bz2 | |
Merge topic 'ninja-generator'
6b5614f Ninja: Substitute <OBJECT> and <CMAKE_C_COMPILER> in depfile flags
| -rw-r--r-- | Modules/Compiler/GNU.cmake | 5 | ||||
| -rw-r--r-- | Source/cmNinjaTargetGenerator.cxx | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/Modules/Compiler/GNU.cmake b/Modules/Compiler/GNU.cmake index bdcaf9d..c74c179 100644 --- a/Modules/Compiler/GNU.cmake +++ b/Modules/Compiler/GNU.cmake @@ -30,7 +30,10 @@ macro(__compiler_gnu lang) # in try_compile mode. GET_PROPERTY(_IN_TC GLOBAL PROPERTY IN_TRY_COMPILE) if(NOT _IN_TC OR CMAKE_FORCE_DEPFILES) - set(CMAKE_DEPFILE_FLAGS_${lang} "-MMD -MF <DEPFILE>") + # distcc does not transform -o to -MT when invoking the preprocessor + # internally, as it ought to. Work around this bug by setting -MT here + # even though it isn't strictly necessary. + set(CMAKE_DEPFILE_FLAGS_${lang} "-MMD -MT <OBJECT> -MF <DEPFILE>") endif() # Initial configuration flags. diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx index 4c4a53f..c76d175 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -339,6 +339,10 @@ cmNinjaTargetGenerator depfile = "$out.d"; cmSystemTools::ReplaceString(depfileFlagsStr, "<DEPFILE>", depfile.c_str()); + cmSystemTools::ReplaceString(depfileFlagsStr, "<OBJECT>", + "$out"); + cmSystemTools::ReplaceString(depfileFlagsStr, "<CMAKE_C_COMPILER>", + this->GetMakefile()->GetDefinition("CMAKE_C_COMPILER")); flags += " " + depfileFlagsStr; } vars.Flags = flags.c_str(); |