summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalNinjaGenerator.h
diff options
context:
space:
mode:
authorAlexis Murzeau <amubtdx@outlook.fr>2016-10-23 16:58:28 (GMT)
committerBrad King <brad.king@kitware.com>2016-10-24 14:30:02 (GMT)
commite983bd326a9e3b7902d8f7cf0d891030ad3bd4c1 (patch)
treed19219a982ea8c6d7b648a29ecb2b73536bc3113 /Source/cmGlobalNinjaGenerator.h
parentf660832999e086f02a9f3552c028aed900cd7249 (diff)
downloadCMake-e983bd326a9e3b7902d8f7cf0d891030ad3bd4c1.zip
CMake-e983bd326a9e3b7902d8f7cf0d891030ad3bd4c1.tar.gz
CMake-e983bd326a9e3b7902d8f7cf0d891030ad3bd4c1.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.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h
index 1084469..81ec3eb 100644
--- a/Source/cmGlobalNinjaGenerator.h
+++ b/Source/cmGlobalNinjaGenerator.h
@@ -241,7 +241,6 @@ public:
}
std::string ConvertToNinjaPath(const std::string& path) const;
- std::string ConvertToNinjaFolderRule(const std::string& path);
struct MapToNinjaPathImpl
{