mirror of
https://github.com/Kitware/CMake.git
synced 2026-01-06 05:40:54 -06:00
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:
@@ -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();
|
||||
|
||||
@@ -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
|
||||
{
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
1
|
||||
11
Tests/RunCMake/Configure/NoCMAKE_CROSS_CONFIGS-stderr.txt
Normal file
11
Tests/RunCMake/Configure/NoCMAKE_CROSS_CONFIGS-stderr.txt
Normal file
@@ -0,0 +1,11 @@
|
||||
^CMake Error:
|
||||
Generator
|
||||
|
||||
[^
|
||||
]*
|
||||
|
||||
does not support variable
|
||||
|
||||
CMAKE_CROSS_CONFIGS
|
||||
|
||||
but it has been specified.
|
||||
1
Tests/RunCMake/Configure/NoCMAKE_CROSS_CONFIGS.cmake
Normal file
1
Tests/RunCMake/Configure/NoCMAKE_CROSS_CONFIGS.cmake
Normal file
@@ -0,0 +1 @@
|
||||
set(CMAKE_CROSS_CONFIGS "")
|
||||
@@ -0,0 +1 @@
|
||||
1
|
||||
@@ -0,0 +1,11 @@
|
||||
^CMake Error:
|
||||
Generator
|
||||
|
||||
[^
|
||||
]*
|
||||
|
||||
does not support variable
|
||||
|
||||
CMAKE_DEFAULT_BUILD_TYPE
|
||||
|
||||
but it has been specified.
|
||||
@@ -0,0 +1 @@
|
||||
set(CMAKE_DEFAULT_BUILD_TYPE "")
|
||||
@@ -0,0 +1 @@
|
||||
1
|
||||
11
Tests/RunCMake/Configure/NoCMAKE_DEFAULT_CONFIGS-stderr.txt
Normal file
11
Tests/RunCMake/Configure/NoCMAKE_DEFAULT_CONFIGS-stderr.txt
Normal file
@@ -0,0 +1,11 @@
|
||||
^CMake Error:
|
||||
Generator
|
||||
|
||||
[^
|
||||
]*
|
||||
|
||||
does not support variable
|
||||
|
||||
CMAKE_DEFAULT_CONFIGS
|
||||
|
||||
but it has been specified.
|
||||
1
Tests/RunCMake/Configure/NoCMAKE_DEFAULT_CONFIGS.cmake
Normal file
1
Tests/RunCMake/Configure/NoCMAKE_DEFAULT_CONFIGS.cmake
Normal file
@@ -0,0 +1 @@
|
||||
set(CMAKE_DEFAULT_CONFIGS "")
|
||||
@@ -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()
|
||||
|
||||
Reference in New Issue
Block a user