diff options
| author | Brad King <brad.king@kitware.com> | 2021-09-10 13:28:25 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-09-10 13:28:39 (GMT) |
| commit | 118a0adf5bf5a8629fd75da9d30f7e5c475eebbc (patch) | |
| tree | 68271b21f4eed58144247018d4a1186894d90e06 | |
| parent | dc971e7da4c2240d9786125735a5d04ff226eee3 (diff) | |
| parent | fa2f6e0f5a4ae2349b3ccc309654b7f6cbadb080 (diff) | |
| download | CMake-118a0adf5bf5a8629fd75da9d30f7e5c475eebbc.zip CMake-118a0adf5bf5a8629fd75da9d30f7e5c475eebbc.tar.gz CMake-118a0adf5bf5a8629fd75da9d30f7e5c475eebbc.tar.bz2 | |
Merge topic 'ninja-rc'
fa2f6e0f5a cmNinjaTargetGenerator: Use short path for cmcldeps.exe
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6502
| -rw-r--r-- | Source/cmNinjaTargetGenerator.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx index 1b6b834..be8bb08 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -774,8 +774,11 @@ void cmNinjaTargetGenerator::WriteCompileRule(const std::string& lang, cmProp d = mf->GetDefinition("CMAKE_C_COMPILER"); const std::string cl = d ? *d : mf->GetSafeDefinition("CMAKE_CXX_COMPILER"); - cldeps = cmStrCat('"', cmSystemTools::GetCMClDepsCommand(), "\" ", lang, - ' ', vars.Source, " $DEP_FILE $out \"", + std::string cmcldepsPath; + cmSystemTools::GetShortPath(cmSystemTools::GetCMClDepsCommand(), + cmcldepsPath); + cldeps = cmStrCat(cmcldepsPath, ' ', lang, ' ', vars.Source, + " $DEP_FILE $out \"", mf->GetSafeDefinition("CMAKE_CL_SHOWINCLUDES_PREFIX"), "\" \"", cl, "\" "); } |