https://github.com/Kitware/CMake
Revision 0c7433e874d5f28b15009dbfb1f19ecb34cd71ee authored by Roland Schulz on 13 April 2018, 00:49:05 UTC, committed by Brad King on 16 April 2018, 18:11:12 UTC
The change in commit v3.11.0-rc1~334^2 (FindOpenMP: Use NO_DEFAULT_PATH where appropriate, 2017-11-15) broke partial support for Intel on Windows. Since `OpenMP_${LANG}_IMPLICIT_LINK_DIRS` is empty for this compiler the `find_library` call without `NO_DEFAULT_PATH` worked accidentally in environments with the needed libraries in the search path already. Fix support for Intel on Windows by simply removing our explicit search for the `libiomp5md` library. In cases that it is needed, the compiler already inserts metadata in `.obj` files to tell the MSVC linker to use the library. Suggested-by: Christian Pfeiffer <cpfeiffer@live.de> Fixes: #17910
1 parent 61fd4c7
Tip revision: 0c7433e874d5f28b15009dbfb1f19ecb34cd71ee authored by Roland Schulz on 13 April 2018, 00:49:05 UTC
FindOpenMP: Fix support for Intel on Windows
FindOpenMP: Fix support for Intel on Windows
Tip revision: 0c7433e
cmInstalledFile.cxx
/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmInstalledFile.h"
#include "cmAlgorithms.h"
#include "cmListFileCache.h"
#include "cmMakefile.h"
#include "cmSystemTools.h"
#include <utility>
cmInstalledFile::cmInstalledFile()
: NameExpression(nullptr)
{
}
cmInstalledFile::~cmInstalledFile()
{
delete NameExpression;
}
cmInstalledFile::Property::Property()
{
}
cmInstalledFile::Property::~Property()
{
cmDeleteAll(this->ValueExpressions);
}
void cmInstalledFile::SetName(cmMakefile* mf, const std::string& name)
{
cmListFileBacktrace backtrace = mf->GetBacktrace();
cmGeneratorExpression ge(backtrace);
this->Name = name;
this->NameExpression = ge.Parse(name).release();
}
std::string const& cmInstalledFile::GetName() const
{
return this->Name;
}
cmCompiledGeneratorExpression const& cmInstalledFile::GetNameExpression() const
{
return *(this->NameExpression);
}
void cmInstalledFile::RemoveProperty(const std::string& prop)
{
this->Properties.erase(prop);
}
void cmInstalledFile::SetProperty(cmMakefile const* mf,
const std::string& prop, const char* value)
{
this->RemoveProperty(prop);
this->AppendProperty(mf, prop, value);
}
void cmInstalledFile::AppendProperty(cmMakefile const* mf,
const std::string& prop,
const char* value, bool /*asString*/)
{
cmListFileBacktrace backtrace = mf->GetBacktrace();
cmGeneratorExpression ge(backtrace);
Property& property = this->Properties[prop];
property.ValueExpressions.push_back(ge.Parse(value).release());
}
bool cmInstalledFile::HasProperty(const std::string& prop) const
{
return this->Properties.find(prop) != this->Properties.end();
}
bool cmInstalledFile::GetProperty(const std::string& prop,
std::string& value) const
{
PropertyMapType::const_iterator i = this->Properties.find(prop);
if (i == this->Properties.end()) {
return false;
}
Property const& property = i->second;
std::string output;
std::string separator;
for (auto ve : property.ValueExpressions) {
output += separator;
output += ve->GetInput();
separator = ";";
}
value = output;
return true;
}
bool cmInstalledFile::GetPropertyAsBool(const std::string& prop) const
{
std::string value;
bool isSet = this->GetProperty(prop, value);
return isSet && cmSystemTools::IsOn(value.c_str());
}
void cmInstalledFile::GetPropertyAsList(const std::string& prop,
std::vector<std::string>& list) const
{
std::string value;
this->GetProperty(prop, value);
list.clear();
cmSystemTools::ExpandListArgument(value, list);
}
Computing file changes ...