diff options
author | Alexis Murzeau <amubtdx@outlook.fr> | 2016-10-23 16:58:28 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-10-24 13:49:23 (GMT) |
commit | 42db2ebc756a48ecdb15841c18747cb69e9df11f (patch) | |
tree | 10cedfd6aa99b59b6952195ffb86937023821fa0 /Source/cmGlobalNinjaGenerator.h | |
parent | 876da11858ab6649bb088c4bb7758fc84910ba20 (diff) | |
download | CMake-42db2ebc756a48ecdb15841c18747cb69e9df11f.zip CMake-42db2ebc756a48ecdb15841c18747cb69e9df11f.tar.gz CMake-42db2ebc756a48ecdb15841c18747cb69e9df11f.tar.bz2 |
Ninja: Use binary dir for `$subdir/all` targets
The targets added by commit v3.6.0-rc1~240^2~2 (Ninja: Add `$subdir/all`
targets, 2016-03-11) use as `$subdir` the relative path from the top of
the source tree to the current source directory. This is not correct
when using `add_subdirectory(test test_bin)`. Instead we need to use
the relative path from the top of the binary tree to the current binary
directory as was done for related targets by commit v3.7.0-rc1~268^2
(Ninja: Add `$subdir/{test,install,package}` targets, 2016-08-05).
Diffstat (limited to 'Source/cmGlobalNinjaGenerator.h')
-rw-r--r-- | Source/cmGlobalNinjaGenerator.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h index dcf7406..2ce3c80 100644 --- a/Source/cmGlobalNinjaGenerator.h +++ b/Source/cmGlobalNinjaGenerator.h @@ -234,7 +234,6 @@ public: } std::string ConvertToNinjaPath(const std::string& path); - std::string ConvertToNinjaFolderRule(const std::string& path); struct MapToNinjaPathImpl { |