From fa18069ebd01ecaef6d7500fcb0de29995d6b516 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 9 Nov 2020 16:15:57 -0500 Subject: Ninja: Exclude unused dyndep features during CMake bootstrap --- Source/cmGlobalNinjaGenerator.cxx | 14 +++++++++----- Source/cmcmd.cxx | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index 83d15ab..24b5ccd 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -2024,6 +2024,8 @@ void cmGlobalNinjaGenerator::StripNinjaOutputPathPrefixAsSuffix( cmStripSuffixIfExists(path, this->OutputPathPrefix); } +#if !defined(CMAKE_BOOTSTRAP) + /* We use the following approach to support Fortran. Each target already @@ -2406,11 +2408,6 @@ bool cmGlobalNinjaGenerator::WriteDyndepFile( return true; } -bool cmGlobalNinjaGenerator::EnableCrossConfigBuild() const -{ - return !this->CrossConfigs.empty(); -} - int cmcmd_cmake_ninja_dyndep(std::vector::const_iterator argBeg, std::vector::const_iterator argEnd) { @@ -2492,6 +2489,13 @@ int cmcmd_cmake_ninja_dyndep(std::vector::const_iterator argBeg, return 0; } +#endif + +bool cmGlobalNinjaGenerator::EnableCrossConfigBuild() const +{ + return !this->CrossConfigs.empty(); +} + void cmGlobalNinjaGenerator::AppendDirectoryForConfig( const std::string& prefix, const std::string& config, const std::string& suffix, std::string& dir) diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx index a611dd7..81374a1 100644 --- a/Source/cmcmd.cxx +++ b/Source/cmcmd.cxx @@ -1167,7 +1167,7 @@ int cmcmd::ExecuteCMakeCommand(std::vector const& args, return cmcmd::ExecuteLinkScript(args); } -#if !defined(CMAKE_BOOTSTRAP) || defined(CMAKE_BOOTSTRAP_NINJA) +#if !defined(CMAKE_BOOTSTRAP) // Internal CMake ninja dependency scanning support. if (args[1] == "cmake_ninja_depends") { return cmcmd_cmake_ninja_depends(args.begin() + 2, args.end()); -- cgit v0.12