Skip to main content

Browse the archive

https://github.com/Kitware/CMake
10 April 2024, 19:27:19 UTC
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 
CMakeCCompilerId: Fix C standard detection in Clang and IntelLLVM MSVC mode
 
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
Raw File
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
Tip revision: 1c14691
cmCommand.cxx 
/* Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
   file Copyright.txt or https://cmake.org/licensing for details.  */
#include "cmCommand.h"

#include <utility>

#include "cmExecutionStatus.h"
#include "cmMakefile.h"

struct cmListFileArgument;

void cmCommand::SetExecutionStatus(cmExecutionStatus* status)
{
  this->Status = status;
  this->Makefile = &status->GetMakefile();
}

bool cmCommand::InvokeInitialPass(const std::vector<cmListFileArgument>& args,
                                  cmExecutionStatus& status)
{
  std::vector<std::string> expandedArguments;
  if (!this->Makefile->ExpandArguments(args, expandedArguments)) {
    // There was an error expanding arguments.  It was already
    // reported, so we can skip this command without error.
    return true;
  }
  return this->InitialPass(expandedArguments, status);
}

void cmCommand::SetError(const std::string& e)
{
  this->Status->SetError(e);
}

cmLegacyCommandWrapper::cmLegacyCommandWrapper(std::unique_ptr<cmCommand> cmd)
  : Command(std::move(cmd))
{
}

cmLegacyCommandWrapper::cmLegacyCommandWrapper(
  cmLegacyCommandWrapper const& other)
  : Command(other.Command->Clone())
{
}

cmLegacyCommandWrapper& cmLegacyCommandWrapper::operator=(
  cmLegacyCommandWrapper const& other)
{
  this->Command = other.Command->Clone();
  return *this;
}

bool cmLegacyCommandWrapper::operator()(
  std::vector<cmListFileArgument> const& args, cmExecutionStatus& status) const
{
  auto cmd = this->Command->Clone();
  cmd->SetExecutionStatus(&status);
  return cmd->InvokeInitialPass(args, status);
}
back to top