summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalNinjaGenerator.h
diff options
context:
space:
mode:
authorKyle Edwards <kyle.edwards@kitware.com>2020-10-13 14:37:30 (GMT)
committerKyle Edwards <kyle.edwards@kitware.com>2020-10-13 14:52:02 (GMT)
commit297ab15bf6cbc75f30c83238977b4b83524e7107 (patch)
tree363cb947fbd354a2580fd3fe1e3cf2daa07ae094 /Source/cmGlobalNinjaGenerator.h
parenta1988e4c80a7c75f216814c5827796e976c25605 (diff)
downloadCMake-297ab15bf6cbc75f30c83238977b4b83524e7107.zip
CMake-297ab15bf6cbc75f30c83238977b4b83524e7107.tar.gz
CMake-297ab15bf6cbc75f30c83238977b4b83524e7107.tar.bz2
Ninja Multi-Config: Read configuration variables as normal variables
Early versions of the Ninja Multi-Config generator required CMAKE_CONFIGURATION_TYPES and friends to be cache variables in order to support selecting the default config in cmake(1) --build. The behavior of cmake(1) --build has since been updated to no longer require this, and requiring these variables to be cache variables is inconsistent with the other generators. Read the variables as normal CMake variables like the other generators. This does not require a policy, since the only scenario where this would cause a breakage is one where the cache variable and the CMake variable are explicitly set to different values, which doesn't make sense to do anyway.
Diffstat (limited to 'Source/cmGlobalNinjaGenerator.h')
-rw-r--r--Source/cmGlobalNinjaGenerator.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h
index 884a711..f6e7633 100644
--- a/Source/cmGlobalNinjaGenerator.h
+++ b/Source/cmGlobalNinjaGenerator.h
@@ -31,7 +31,6 @@ class cmLinkLineComputer;
class cmLocalGenerator;
class cmMakefile;
class cmOutputConverter;
-class cmState;
class cmStateDirectory;
class cmake;
struct cmDocumentationEntry;
@@ -647,8 +646,6 @@ public:
std::string GetDefaultBuildConfig() const override;
- bool ReadCacheEntriesForBuild(const cmState& state) override;
-
bool SupportsDefaultBuildType() const override { return true; }
bool SupportsCrossConfigs() const override { return true; }
bool SupportsDefaultConfigs() const override { return true; }