diff options
| author | Brad King <brad.king@kitware.com> | 2020-11-09 21:15:57 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-11-16 16:42:40 (GMT) |
| commit | fa18069ebd01ecaef6d7500fcb0de29995d6b516 (patch) | |
| tree | 8a96f1caaafa16d84ee0962bee39d70dcf9c613a /Source/cmGlobalNinjaGenerator.cxx | |
| parent | 01b473b81098e95ac3e6cbf173c78bf02bdf036c (diff) | |
| download | CMake-fa18069ebd01ecaef6d7500fcb0de29995d6b516.zip CMake-fa18069ebd01ecaef6d7500fcb0de29995d6b516.tar.gz CMake-fa18069ebd01ecaef6d7500fcb0de29995d6b516.tar.bz2 | |
Ninja: Exclude unused dyndep features during CMake bootstrap
Diffstat (limited to 'Source/cmGlobalNinjaGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalNinjaGenerator.cxx | 14 |
1 files changed, 9 insertions, 5 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<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) |