diff options
author | Brad King <brad.king@kitware.com> | 2020-08-11 12:56:52 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2020-08-11 12:57:00 (GMT) |
commit | a218d67f500614ddd6a2ddcf9f55ad964243673f (patch) | |
tree | 406ac21a3f632bb8d4ca97b3137afe472d402517 /Source/cmcmd.cxx | |
parent | 3fb9e3cc67e8279bae04f6863eceea996ddca626 (diff) | |
parent | 491dddfbdeb7b958805e931b37783cca448eb8d8 (diff) | |
download | CMake-a218d67f500614ddd6a2ddcf9f55ad964243673f.zip CMake-a218d67f500614ddd6a2ddcf9f55ad964243673f.tar.gz CMake-a218d67f500614ddd6a2ddcf9f55ad964243673f.tar.bz2 |
Merge topic 'bootstrap-ninja'
491dddfbde Bootstrap: Add support for Ninja
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3652
Diffstat (limited to 'Source/cmcmd.cxx')
-rw-r--r-- | Source/cmcmd.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx index a1c6771..15d2fd1 100644 --- a/Source/cmcmd.cxx +++ b/Source/cmcmd.cxx @@ -1161,7 +1161,7 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string> const& args) return cmcmd::ExecuteLinkScript(args); } -#ifndef CMAKE_BOOTSTRAP +#if !defined(CMAKE_BOOTSTRAP) || defined(CMAKE_BOOTSTRAP_NINJA) // Internal CMake ninja dependency scanning support. if (args[1] == "cmake_ninja_depends") { return cmcmd_cmake_ninja_depends(args.begin() + 2, args.end()); |