mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-04 21:30:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'minor-refactoring'

Browse Source 
8c066045ec Source: Improve some code readability and efficiency
f64a774b49 Source: Reuse some existing variable declarations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8492
This commit is contained in:
Brad King
2023-05-22 16:39:01 +00:00
committed by Kitware Robot
parent 8ce4e76dbf 8c066045ec
commit fc29c5f1bf
4 changed files with 38 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmExternalMakefileProjectGenerator.cxx
+6 -7
View File
@@ -17,14 +17,13 @@ void cmExternalMakefileProjectGenerator::EnableLanguage(
std::string cmExternalMakefileProjectGenerator::CreateFullGeneratorName(
const std::string& globalGenerator, const std::string& extraGenerator)
{
std::string fullName;
if (!globalGenerator.empty()) {
if (!extraGenerator.empty()) {
fullName = cmStrCat(extraGenerator, " - ");
}
fullName += globalGenerator;
if (globalGenerator.empty()) {
return {};
}
return fullName;
if (extraGenerator.empty()) {
return globalGenerator;
}
return cmStrCat(extraGenerator, " - ", globalGenerator);
}
bool cmExternalMakefileProjectGenerator::Open(
Source/cmMessenger.cxx
+21 -34
View File
@@ -18,51 +18,38 @@
MessageType cmMessenger::ConvertMessageType(MessageType t) const
{
bool warningsAsErrors;
if (t == MessageType::AUTHOR_WARNING || t == MessageType::AUTHOR_ERROR) {
warningsAsErrors = this->GetDevWarningsAsErrors();
if (warningsAsErrors && t == MessageType::AUTHOR_WARNING) {
t = MessageType::AUTHOR_ERROR;
} else if (!warningsAsErrors && t == MessageType::AUTHOR_ERROR) {
t = MessageType::AUTHOR_WARNING;
}
} else if (t == MessageType::DEPRECATION_WARNING ||
t == MessageType::DEPRECATION_ERROR) {
warningsAsErrors = this->GetDeprecatedWarningsAsErrors();
if (warningsAsErrors && t == MessageType::DEPRECATION_WARNING) {
t = MessageType::DEPRECATION_ERROR;
} else if (!warningsAsErrors && t == MessageType::DEPRECATION_ERROR) {
t = MessageType::DEPRECATION_WARNING;
if (this->GetDevWarningsAsErrors()) {
return MessageType::AUTHOR_ERROR;
}
return MessageType::AUTHOR_WARNING;
}
if (t == MessageType::DEPRECATION_WARNING ||
t == MessageType::DEPRECATION_ERROR) {
if (this->GetDeprecatedWarningsAsErrors()) {
return MessageType::DEPRECATION_ERROR;
}
return MessageType::DEPRECATION_WARNING;
}
return t;
}
bool cmMessenger::IsMessageTypeVisible(MessageType t) const
{
bool isVisible = true;
if (t == MessageType::DEPRECATION_ERROR) {
if (!this->GetDeprecatedWarningsAsErrors()) {
isVisible = false;
}
} else if (t == MessageType::DEPRECATION_WARNING) {
if (this->GetSuppressDeprecatedWarnings()) {
isVisible = false;
}
} else if (t == MessageType::AUTHOR_ERROR) {
if (!this->GetDevWarningsAsErrors()) {
isVisible = false;
}
} else if (t == MessageType::AUTHOR_WARNING) {
if (this->GetSuppressDevWarnings()) {
isVisible = false;
}
return this->GetDeprecatedWarningsAsErrors();
}
if (t == MessageType::DEPRECATION_WARNING) {
return !this->GetSuppressDeprecatedWarnings();
}
if (t == MessageType::AUTHOR_ERROR) {
return this->GetDevWarningsAsErrors();
}
if (t == MessageType::AUTHOR_WARNING) {
return !this->GetSuppressDevWarnings();
}
return isVisible;
return true;
}
static bool printMessagePreamble(MessageType t, std::ostream& msg)
Source/cmState.cxx
+7 -5
View File
@@ -101,11 +101,13 @@ cmStateEnums::CacheEntryType cmState::StringToCacheEntryType(
bool cmState::StringToCacheEntryType(const std::string& s,
cmStateEnums::CacheEntryType& type)
{
for (size_t i = 0; i < cmCacheEntryTypes.size(); ++i) {
if (s == cmCacheEntryTypes[i]) {
type = static_cast<cmStateEnums::CacheEntryType>(i);
return true;
}
// NOLINTNEXTLINE(readability-qualified-auto)
auto const entry =
std::find(cmCacheEntryTypes.begin(), cmCacheEntryTypes.end(), s);
if (entry != cmCacheEntryTypes.end()) {
type = static_cast<cmStateEnums::CacheEntryType>(
entry - cmCacheEntryTypes.begin());
return true;
}
return false;
}
Source/cmake.cxx
+4 -6
View File
@@ -2138,12 +2138,10 @@ int cmake::DoPreConfigureChecks()
std::string cacheStart =
cmStrCat(*this->State->GetInitializedCacheValue("CMAKE_HOME_DIRECTORY"),
"/CMakeLists.txt");
std::string currentStart =
cmStrCat(this->GetHomeDirectory(), "/CMakeLists.txt");
if (!cmSystemTools::SameFile(cacheStart, currentStart)) {
if (!cmSystemTools::SameFile(cacheStart, srcList)) {
std::string message =
cmStrCat("The source \"", currentStart,
"\" does not match the source \"", cacheStart,
cmStrCat("The source \"", srcList, "\" does not match the source \"",
cacheStart,
"\" used to generate cache. Re-run cmake with a different "
"source directory.");
cmSystemTools::Error(message);
@@ -2380,7 +2378,7 @@ int cmake::ActualConfigure()
return -2;
}
}
if (!this->State->GetInitializedCacheValue("CMAKE_GENERATOR")) {
if (!genName) {
this->AddCacheEntry("CMAKE_GENERATOR", this->GlobalGenerator->GetName(),
"Name of generator.", cmStateEnums::INTERNAL);
this->AddCacheEntry(