mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-09 15:20:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

Ninja: Record dyndep support by Ninja 1.10

Browse Source 
Upstream Ninja 1.10 and above support the `dyndep` feature we need
for Fortran.
This commit is contained in:
Brad King
2019-07-30 13:53:44 -04:00
parent 83368b4dd5
commit c81a86ee6d
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Source/cmGlobalNinjaGenerator.cxx
View File

@@ -548,7 +548,11 @@ void cmGlobalNinjaGenerator::CheckNinjaFeatures()
this->NinjaSupportsMultilineDepfile = !cmSystemTools::VersionCompare(
cmSystemTools::OP_LESS, this->NinjaVersion.c_str(),
RequiredNinjaVersionForMultilineDepfile().c_str());
{
this->NinjaSupportsDyndeps = !cmSystemTools::VersionCompare(
cmSystemTools::OP_LESS, this->NinjaVersion.c_str(),
RequiredNinjaVersionForDyndeps().c_str());
if (!this->NinjaSupportsDyndeps) {
// The ninja version number is not new enough to have upstream support.
// Our ninja branch adds ".dyndep-#" to its version number,
// where '#' is a feature-specific version number. Extract it.
static std::string const k_DYNDEP_ = ".dyndep-";
@@ -586,9 +590,10 @@ bool cmGlobalNinjaGenerator::CheckFortran(cmMakefile* mf) const
"The Ninja generator does not support Fortran using Ninja version\n"
" " + this->NinjaVersion + "\n"
"due to lack of required features. "
"Kitware has implemented the required features but as of this version "
"of CMake they have not been integrated to upstream ninja. "
"Pending integration, Kitware maintains a branch at:\n"
"Kitware has implemented the required features and they have been "
"merged to upstream ninja for inclusion in Ninja 1.10 and higher. "
"As of this version of CMake, Ninja 1.10 has not been released. "
"Meanwhile, Kitware maintains a branch of Ninja at:\n"
" https://github.com/Kitware/ninja/tree/features-for-fortran#readme\n"
"with the required features. "
"One may build ninja from that branch to get support for Fortran."

1
Source/cmGlobalNinjaGenerator.h
View File

@@ -322,6 +322,7 @@ public:
{
return "1.9";
}
static std::string RequiredNinjaVersionForDyndeps() { return "1.10"; }
bool SupportsConsolePool() const;
bool SupportsImplicitOuts() const;
bool SupportsManifestRestat() const;