Generator: Don't allow Ninja Multi-Config variables on other generators

We may want to enable these variables later on with specific
semantics. To avoid breaking backwards compatibility, make it an
error to use them for now.
This commit is contained in:
Kyle Edwards
2020-02-26 16:37:30 -05:00
committed by Brad King
parent 7a63dafafb
commit 9590c3a400
13 changed files with 91 additions and 0 deletions

View File

@@ -1361,8 +1361,43 @@ void cmGlobalGenerator::ComputeBuildFileGenerators()
}
}
bool cmGlobalGenerator::UnsupportedVariableIsDefined(const std::string& name,
bool supported) const
{
if (!supported && this->Makefiles.front()->GetDefinition(name)) {
std::ostringstream e;
/* clang-format off */
e <<
"Generator\n"
" " << this->GetName() << "\n"
"does not support variable\n"
" " << name << "\n"
"but it has been specified."
;
/* clang-format on */
this->GetCMakeInstance()->IssueMessage(MessageType::FATAL_ERROR, e.str());
return true;
}
return false;
}
bool cmGlobalGenerator::Compute()
{
// Make sure unsupported variables are not used.
if (this->UnsupportedVariableIsDefined("CMAKE_DEFAULT_BUILD_TYPE",
this->SupportsDefaultBuildType())) {
return false;
}
if (this->UnsupportedVariableIsDefined("CMAKE_CROSS_CONFIGS",
this->SupportsCrossConfigs())) {
return false;
}
if (this->UnsupportedVariableIsDefined("CMAKE_DEFAULT_CONFIGS",
this->SupportsDefaultConfigs())) {
return false;
}
// Some generators track files replaced during the Generate.
// Start with an empty vector:
this->FilesReplacedDuringGenerate.clear();

View File

@@ -455,6 +455,10 @@ public:
/** Generate an <output>.rule file path for a given command output. */
virtual std::string GenerateRuleFile(std::string const& output) const;
virtual bool SupportsDefaultBuildType() const { return false; }
virtual bool SupportsCrossConfigs() const { return false; }
virtual bool SupportsDefaultConfigs() const { return false; }
static std::string EscapeJSON(const std::string& s);
void ProcessEvaluationFiles();
@@ -674,6 +678,9 @@ private:
virtual const char* GetBuildIgnoreErrorsFlag() const { return nullptr; }
bool UnsupportedVariableIsDefined(const std::string& name,
bool supported) const;
// Cache directory content and target files to be built.
struct DirectoryContent
{

View File

@@ -640,6 +640,10 @@ public:
bool ReadCacheEntriesForBuild(const cmState& state) override;
bool SupportsDefaultBuildType() const override { return true; }
bool SupportsCrossConfigs() const override { return true; }
bool SupportsDefaultConfigs() const override { return true; }
protected:
bool OpenBuildFileStreams() override;
void CloseBuildFileStreams() override;

View File

@@ -0,0 +1 @@
1

View File

@@ -0,0 +1,11 @@
^CMake Error:
Generator
[^
]*
does not support variable
CMAKE_CROSS_CONFIGS
but it has been specified.

View File

@@ -0,0 +1 @@
set(CMAKE_CROSS_CONFIGS "")

View File

@@ -0,0 +1 @@
1

View File

@@ -0,0 +1,11 @@
^CMake Error:
Generator
[^
]*
does not support variable
CMAKE_DEFAULT_BUILD_TYPE
but it has been specified.

View File

@@ -0,0 +1 @@
set(CMAKE_DEFAULT_BUILD_TYPE "")

View File

@@ -0,0 +1 @@
1

View File

@@ -0,0 +1,11 @@
^CMake Error:
Generator
[^
]*
does not support variable
CMAKE_DEFAULT_CONFIGS
but it has been specified.

View File

@@ -0,0 +1 @@
set(CMAKE_DEFAULT_CONFIGS "")

View File

@@ -50,3 +50,9 @@ file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
run_cmake(RemoveCache)
file(REMOVE "${RunCMake_TEST_BINARY_DIR}/CMakeCache.txt")
run_cmake(RemoveCache)
if(NOT RunCMake_GENERATOR MATCHES "^Ninja Multi-Config$")
run_cmake(NoCMAKE_CROSS_CONFIGS)
run_cmake(NoCMAKE_DEFAULT_BUILD_TYPE)
run_cmake(NoCMAKE_DEFAULT_CONFIGS)
endif()