mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-11 16:32:14 -06:00
Code Issues Packages Projects Releases Wiki Activity

Ninja: Exclude unused dyndep features during CMake bootstrap

Browse Source
This commit is contained in:
Brad King
2020-11-09 16:15:57 -05:00
parent 01b473b810
commit fa18069ebd
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Source/cmGlobalNinjaGenerator.cxx
View File

@@ -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<std::string>::const_iterator argBeg,
std::vector<std::string>::const_iterator argEnd)
{
@@ -2492,6 +2489,13 @@ int cmcmd_cmake_ninja_dyndep(std::vector<std::string>::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)

2
Source/cmcmd.cxx
View File

@@ -1167,7 +1167,7 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string> 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());