https://github.com/Kitware/CMake
Revision 1c14691a86ab8c6939dd04707dc2a92125fa8629 authored by Raul Tambre on 07 February 2021, 09:27:21 UTC, committed by Brad King on 09 July 2021, 15:27:47 UTC
Clang does not define `__STDC__` if in MSVC compatibility mode, but does define `__STDC_VERSION__`. Avoid the fallback for this combination. This backports commit 7596d8b951 (CMakeCCompilerId: Fix C standard detection in Clang MSVC mode, 2021-02-07, v3.21.0-rc1~587^2~14) to the 3.20 release series. This is needed since commit 5115dd1e2c (IntelLLVM: Fix C/C++ standard level flags on Windows, 2021-07-07, v3.21.0-rc3~7^2^2) now that we activate C/C++ standard level logic for IntelLLVM when targeting the MSVC ABI.
1 parent 5115dd1
Tip revision: 1c14691a86ab8c6939dd04707dc2a92125fa8629 authored by Raul Tambre on 07 February 2021, 09:27:21 UTC
CMakeCCompilerId: Fix C standard detection in Clang and IntelLLVM MSVC mode
CMakeCCompilerId: Fix C standard detection in Clang and IntelLLVM MSVC mode
Tip revision: 1c14691
cmTargetPropertyComputer.h
/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
file Copyright.txt or https://cmake.org/licensing for details. */
#pragma once
#include "cmConfigure.h" // IWYU pragma: keep
#include <string>
#include "cmListFileCache.h"
#include "cmProperty.h"
#include "cmStateTypes.h"
#include "cmStringAlgorithms.h"
#include "cmSystemTools.h"
class cmMessenger;
class cmTargetPropertyComputer
{
public:
template <typename Target>
static cmProp GetProperty(Target const* tgt, const std::string& prop,
cmMessenger* messenger,
cmListFileBacktrace const& context)
{
if (cmProp loc = GetLocation(tgt, prop, messenger, context)) {
return loc;
}
if (cmSystemTools::GetFatalErrorOccured()) {
return nullptr;
}
if (prop == "SOURCES") {
return GetSources(tgt, messenger, context);
}
return nullptr;
}
private:
static bool HandleLocationPropertyPolicy(std::string const& tgtName,
cmMessenger* messenger,
cmListFileBacktrace const& context);
template <typename Target>
static const std::string& ComputeLocationForBuild(Target const* tgt);
template <typename Target>
static const std::string& ComputeLocation(Target const* tgt,
std::string const& config);
template <typename Target>
static cmProp GetLocation(Target const* tgt, std::string const& prop,
cmMessenger* messenger,
cmListFileBacktrace const& context)
{
// Watch for special "computed" properties that are dependent on
// other properties or variables. Always recompute them.
if (tgt->GetType() == cmStateEnums::EXECUTABLE ||
tgt->GetType() == cmStateEnums::STATIC_LIBRARY ||
tgt->GetType() == cmStateEnums::SHARED_LIBRARY ||
tgt->GetType() == cmStateEnums::MODULE_LIBRARY ||
tgt->GetType() == cmStateEnums::UNKNOWN_LIBRARY) {
static const std::string propLOCATION = "LOCATION";
if (prop == propLOCATION) {
if (!tgt->IsImported() &&
!HandleLocationPropertyPolicy(tgt->GetName(), messenger,
context)) {
return nullptr;
}
return &ComputeLocationForBuild(tgt);
}
// Support "LOCATION_<CONFIG>".
if (cmHasLiteralPrefix(prop, "LOCATION_")) {
if (!tgt->IsImported() &&
!HandleLocationPropertyPolicy(tgt->GetName(), messenger,
context)) {
return nullptr;
}
std::string configName = prop.substr(9);
return &ComputeLocation(tgt, configName);
}
// Support "<CONFIG>_LOCATION".
if (cmHasLiteralSuffix(prop, "_LOCATION") &&
!cmHasLiteralPrefix(prop, "XCODE_ATTRIBUTE_")) {
std::string configName(prop.c_str(), prop.size() - 9);
if (configName != "IMPORTED") {
if (!tgt->IsImported() &&
!HandleLocationPropertyPolicy(tgt->GetName(), messenger,
context)) {
return nullptr;
}
return &ComputeLocation(tgt, configName);
}
}
}
return nullptr;
}
template <typename Target>
static cmProp GetSources(Target const* tgt, cmMessenger* messenger,
cmListFileBacktrace const& context);
};
Computing file changes ...