diff options
author | Brad King <brad.king@kitware.com> | 2020-02-06 15:11:51 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2020-02-06 15:11:58 (GMT) |
commit | 36926f5b8b23f72dc41cf9665f6b2c60e2be01ec (patch) | |
tree | ee2fdb226fb6caaf25ffd7494f365607dea6f812 /Source | |
parent | 6b659b0abd4f630dff31e7620fa70dfe6f85891a (diff) | |
parent | 65679ed8d9f4824c92621f883c829c5fc6add0fb (diff) | |
download | CMake-36926f5b8b23f72dc41cf9665f6b2c60e2be01ec.zip CMake-36926f5b8b23f72dc41cf9665f6b2c60e2be01ec.tar.gz CMake-36926f5b8b23f72dc41cf9665f6b2c60e2be01ec.tar.bz2 |
Merge topic 'cmakefiles-rules-ninja'
65679ed8d9 Ninja: Move rules.ninja into CMakeFiles
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4328
Diffstat (limited to 'Source')
-rw-r--r-- | Source/cmGlobalNinjaGenerator.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index ff1e5d6..aaad201 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -46,7 +46,8 @@ #include "cmake.h" const char* cmGlobalNinjaGenerator::NINJA_BUILD_FILE = "build.ninja"; -const char* cmGlobalNinjaGenerator::NINJA_RULES_FILE = "rules.ninja"; +const char* cmGlobalNinjaGenerator::NINJA_RULES_FILE = + "CMakeFiles/rules.ninja"; const char* cmGlobalNinjaGenerator::INDENT = " "; #ifdef _WIN32 std::string const cmGlobalNinjaGenerator::SHELL_NOOP = "cd ."; |