diff options
| author | Brad King <brad.king@kitware.com> | 2022-03-01 13:47:10 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-03-01 13:47:16 (GMT) |
| commit | 82b8bd4ef9dcae162ecbffa5604d590c9d6ed929 (patch) | |
| tree | b13ca356b7ea4071ad967e61aebca9274071271c /Source/cmcmd.cxx | |
| parent | d687047f99b7fd16c8d6f9b95c44b865426c3ca4 (diff) | |
| parent | d33b12d84b59fd3310c31de7d9c3f83b28b681e2 (diff) | |
| download | CMake-82b8bd4ef9dcae162ecbffa5604d590c9d6ed929.zip CMake-82b8bd4ef9dcae162ecbffa5604d590c9d6ed929.tar.gz CMake-82b8bd4ef9dcae162ecbffa5604d590c9d6ed929.tar.bz2 | |
Merge topic 'symlink-build-under-source'
d33b12d84b Add support for build tree symlink inside source tree
43416c48ed cmOutputConverter: Always set relative path top source and binary together
de766bc7e0 Xcode: Fix support for source tree symlink inside build tree
55db2cf1e5 Makefiles: Fix "make depend" with add_custom_command DEPFILE
Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7020
Diffstat (limited to 'Source/cmcmd.cxx')
| -rw-r--r-- | Source/cmcmd.cxx | 6 |
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; } |