summaryrefslogtreecommitdiffstats
path: root/Source/cmcmd.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2022-02-28 15:16:51 (GMT)
committerBrad King <brad.king@kitware.com>2022-02-28 15:25:18 (GMT)
commit43416c48ed6bb7d3b8063ac4ea1ba02a4aab828e (patch)
treeeff805381983587d9775f726ff40d9caba37aeea /Source/cmcmd.cxx
parentde766bc7e0f4a856abc712e64e4248e966ced37f (diff)
downloadCMake-43416c48ed6bb7d3b8063ac4ea1ba02a4aab828e.zip
CMake-43416c48ed6bb7d3b8063ac4ea1ba02a4aab828e.tar.gz
CMake-43416c48ed6bb7d3b8063ac4ea1ba02a4aab828e.tar.bz2
cmOutputConverter: Always set relative path top source and binary together
Refactor to set both at once so we have a single place in the code that knows both have been set.
Diffstat (limited to 'Source/cmcmd.cxx')
-rw-r--r--Source/cmcmd.cxx6
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index ba61a83..f1c1bdc 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -1286,8 +1286,7 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string> const& args,
// FIXME: With advanced add_subdirectory usage, these are
// not necessarily the same as the generator originally used.
// We should pass all these directories through an info file.
- lgd->SetRelativePathTopSource(homeDir);
- lgd->SetRelativePathTopBinary(homeOutDir);
+ lgd->SetRelativePathTop(homeDir, homeOutDir);
// Actually scan dependencies.
return lgd->UpdateDependencies(depInfo, verbose, color) ? 0 : 2;
@@ -1569,8 +1568,7 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string> const& args,
// FIXME: With advanced add_subdirectory usage, these are
// not necessarily the same as the generator originally used.
// We should pass all these directories through an info file.
- lgd->SetRelativePathTopSource(homeDir);
- lgd->SetRelativePathTopBinary(homeOutDir);
+ lgd->SetRelativePathTop(homeDir, homeOutDir);
return cmTransformDepfile(format, *lgd, args[8], args[9]) ? 0 : 2;
}