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
cmVisualStudioWCEPlatformParser.h
/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
file Copyright.txt or https://cmake.org/licensing for details. */
#ifndef cmVisualStudioWCEPlatformParser_h
#define cmVisualStudioWCEPlatformParser_h
#include "cmConfigure.h" // IWYU pragma: keep
#include <map>
#include <stddef.h>
#include <string>
#include <vector>
#include "cmXMLParser.h"
// This class is used to parse XML with configuration
// of installed SDKs in system
class cmVisualStudioWCEPlatformParser : public cmXMLParser
{
public:
cmVisualStudioWCEPlatformParser(const char* name = NULL)
: RequiredName(name)
, FoundRequiredName(false)
{
}
int ParseVersion(const char* version);
bool Found() const { return this->FoundRequiredName; }
const char* GetArchitectureFamily() const;
std::string GetOSVersion() const;
std::string GetIncludeDirectories() const
{
return this->FixPaths(this->Include);
}
std::string GetLibraryDirectories() const
{
return this->FixPaths(this->Library);
}
std::string GetPathDirectories() const { return this->FixPaths(this->Path); }
const std::vector<std::string>& GetAvailablePlatforms() const
{
return this->AvailablePlatforms;
}
protected:
virtual void StartElement(const std::string& name, const char** attributes);
void EndElement(const std::string& name);
void CharacterDataHandler(const char* data, int length);
private:
std::string FixPaths(const std::string& paths) const;
std::string CharacterData;
std::string Include;
std::string Library;
std::string Path;
std::string PlatformName;
std::string OSMajorVersion;
std::string OSMinorVersion;
std::map<std::string, std::string> Macros;
std::vector<std::string> AvailablePlatforms;
const char* RequiredName;
bool FoundRequiredName;
std::string VcInstallDir;
std::string VsInstallDir;
};
#endif
Computing file changes ...